Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backout ddb4df63c258 on a CLOSED TREE due to ARM v6 bustage.

Browse Source
This commit is contained in:
Scott Johnson 2013-03-04 16:50:40 -06:00
parent b4dbe78bc6
commit a2535182f9
4 changed files with 20 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
layout/generic/crashtests/810726-2.html
View File

@ -1,57 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<style type="text/css">
body {
font-size: 0.875em;
line-height: 1.30em;
font-family: Arial;
}
p, ul, li {
margin: 0;
padding: 0;
background-color: rgb(235, 235, 235);
}
ul { -moz-column-count: 2;
background-color: rgb(255, 200, 200);
}
li { margin-left: 17px }
.wrapper {
background-color: rgb(255, 0, 155); max-width: 910px;
border: 1px solid green;
}
.column {
width: 73%;
padding: 20px 60px 20px 40px;
-moz-box-sizing: border-box;
background-color: rgb(0, 95, 255);
}
.img {
float: left;
width: 261px;
height: 150px;
background-color: rgb(88, 20, 100);
}
</style>
</head>
<body>
<div class="wrapper">
<div id="colEle" class="column">
<ul>
<li>
<p>123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123</p>
</li>
<li>
<p>123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123</p>
<div class="img"></div>
</li>
</ul>
</div>
</div>
</body>
</html>

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>

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

@ -439,7 +439,6 @@ 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
load 840818.html
test-pref(layout.css.flexbox.enabled,true) load 812822-1.html
asserts(1) test-pref(layout.css.flexbox.enabled,true) load 824297-1.html # bug 399262

33
layout/generic/nsColumnSetFrame.cpp
View File

@ -749,27 +749,34 @@ nsColumnSetFrame::ReflowChildren(nsHTMLReflowMetrics& aDesiredSize,
if ((contentBottom > aReflowState.mComputedMaxHeight ||
contentBottom > aReflowState.ComputedHeight()) &&
aConfig.mBalanceColCount < INT32_MAX) {
contentBottom > aReflowState.ComputedHeight()) &&
aConfig.mBalanceColCount < INT32_MAX) {
// We overflowed vertically, but have not exceeded the number
// of columns. If we're balancing, then we should try reverting
// to auto instead.
aColData.mShouldRevertToAuto = true;
break;
}
if (columnCount >= aConfig.mBalanceColCount) {
// No more columns allowed here. Stop.
aStatus |= NS_FRAME_REFLOW_NEXTINFLOW;
kidNextInFlow->AddStateBits(NS_FRAME_IS_DIRTY);
// Move any of our leftover columns to our overflow list. Our
// next-in-flow will eventually pick them up.
const nsFrameList& continuationColumns = mFrames.RemoveFramesAfter(child);
if (continuationColumns.NotEmpty()) {
SetOverflowFrames(PresContext(), continuationColumns);
if (contentBottom >= aReflowState.availableHeight) {
// No more columns allowed here. Stop.
aStatus |= NS_FRAME_REFLOW_NEXTINFLOW;
kidNextInFlow->AddStateBits(NS_FRAME_IS_DIRTY);
// Move any of our leftover columns to our overflow list. Our
// next-in-flow will eventually pick them up.
const nsFrameList& continuationColumns = mFrames.RemoveFramesAfter(child);
if (continuationColumns.NotEmpty()) {
SetOverflowFrames(PresContext(), continuationColumns);
}
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;
}
child = nullptr;
break;
}
}