Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 264839. Don't let columns try a line-by-line search for the optimal height if we appear to be crawling through a frame that's continuously breakable. r+sr=dbaron

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@165762 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
roc+%cs.cmu.edu 2004-11-25 00:11:35 +00:00
parent 0243b397c3
commit cc8218faa2
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/layout/generic/nsColumnSetFrame.cpp
View File

@ -732,8 +732,14 @@ nsColumnSetFrame::Reflow(nsPresContext* aPresContext,
// iteration.
nscoord knownFeasibleHeight = NS_INTRINSICSIZE;
nscoord knownInfeasibleHeight = 0;
// We set this flag when we detect that we may contain a frame
// that can break anywhere (thus foiling the linear decrease-by-one
// search)
PRBool maybeContinuousBreakingDetected = PR_FALSE;
while (1) {
nscoord lastKnownFeasibleHeight = knownFeasibleHeight;
nscoord maxHeight = 0;
for (nsIFrame* f = mFrames.FirstChild(); f; f = f->GetNextSibling()) {
maxHeight = PR_MAX(maxHeight, f->GetSize().height);
@ -775,9 +781,17 @@ nsColumnSetFrame::Reflow(nsPresContext* aPresContext,
break;
}
if (lastKnownFeasibleHeight - knownFeasibleHeight == 1) {
// We decreased the feasible height by one twip only. This could
// indicate that there is a continuously breakable child frame
// that we are crawling through.
maybeContinuousBreakingDetected = PR_TRUE;
}
nscoord nextGuess = (knownFeasibleHeight + knownInfeasibleHeight)/2;
// The constant of 600 twips is arbitrary. It's about two line-heights.
if (knownFeasibleHeight - nextGuess < 600) {
if (knownFeasibleHeight - nextGuess < 600 &&
!maybeContinuousBreakingDetected) {
// We're close to our target, so just try shrinking just the
// minimum amount that will cause one of our columns to break
// differently.

16
mozilla/layout/html/base/src/nsColumnSetFrame.cpp
View File

@ -732,8 +732,14 @@ nsColumnSetFrame::Reflow(nsPresContext* aPresContext,
// iteration.
nscoord knownFeasibleHeight = NS_INTRINSICSIZE;
nscoord knownInfeasibleHeight = 0;
// We set this flag when we detect that we may contain a frame
// that can break anywhere (thus foiling the linear decrease-by-one
// search)
PRBool maybeContinuousBreakingDetected = PR_FALSE;
while (1) {
nscoord lastKnownFeasibleHeight = knownFeasibleHeight;
nscoord maxHeight = 0;
for (nsIFrame* f = mFrames.FirstChild(); f; f = f->GetNextSibling()) {
maxHeight = PR_MAX(maxHeight, f->GetSize().height);
@ -775,9 +781,17 @@ nsColumnSetFrame::Reflow(nsPresContext* aPresContext,
break;
}
if (lastKnownFeasibleHeight - knownFeasibleHeight == 1) {
// We decreased the feasible height by one twip only. This could
// indicate that there is a continuously breakable child frame
// that we are crawling through.
maybeContinuousBreakingDetected = PR_TRUE;
}
nscoord nextGuess = (knownFeasibleHeight + knownInfeasibleHeight)/2;
// The constant of 600 twips is arbitrary. It's about two line-heights.
if (knownFeasibleHeight - nextGuess < 600) {
if (knownFeasibleHeight - nextGuess < 600 &&
!maybeContinuousBreakingDetected) {
// We're close to our target, so just try shrinking just the
// minimum amount that will cause one of our columns to break
// differently.