wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset a0db951f9f08 (bug 810726) for reftest asserts.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-02-13 17:37:18 -05:00
parent b93e289edd
commit 557dbd0a40
4 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
layout/generic/crashtests/810726.html
View File

@ -1,8 +0,0 @@
<!DOCTYPE html>
<html>
<head>
</head>
<body>
<iframe width="1200" height="1024" src="810726-2.html">
</body>
</html>

21
layout/generic/crashtests/b810726-2.html
View File

@ -1,21 +0,0 @@
<!doctype html>
<html>
<head>
<style>
.outer-bound {
max-width: 980px;
}
.cols {
-moz-column-width: 700px;
}
</style>
</head>
<body>
<div class="outer-bound">
<div class="cols">
<p>There once was a guy.</p>
</div>
</div>
</body>
</html>

1
layout/generic/crashtests/crashtests.list
View File

@ -428,4 +428,3 @@ test-pref(layout.css.flexbox.enabled,true) load 798235-1.html
test-pref(layout.css.flexbox.enabled,true) load 799207-1.html
asserts(12) test-pref(layout.css.flexbox.enabled,true) load 799207-2.html
test-pref(layout.css.flexbox.enabled,true) load 804089-1.xhtml
load 810726.html

11
layout/generic/nsColumnSetFrame.cpp
View File

@ -735,10 +735,7 @@ nsColumnSetFrame::ReflowChildren(nsHTMLReflowMetrics& aDesiredSize,
}
if (columnCount >= aConfig.mBalanceColCount) {
if (contentBottom > aReflowState.mComputedMaxHeight ||
contentBottom > aReflowState.ComputedHeight()) {
aColData.mShouldRevertToAuto = true;
} else {
if (contentBottom >= aReflowState.availableHeight) {
// No more columns allowed here. Stop.
aStatus |= NS_FRAME_REFLOW_NEXTINFLOW;
kidNextInFlow->AddStateBits(NS_FRAME_IS_DIRTY);
@ -750,6 +747,12 @@ nsColumnSetFrame::ReflowChildren(nsHTMLReflowMetrics& aDesiredSize,
}
child = nullptr;
break;
} else if (contentBottom > aReflowState.mComputedMaxHeight ||
contentBottom > aReflowState.ComputedHeight()) {
aColData.mShouldRevertToAuto = true;
} else {
// The number of columns required is too high.
allFit = false;
}
}
}