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

Back out Bug #217527 --> {inc}left column on slashdot is sometimes too narrow or too wide for its contents

Browse Source 
as it caused a regression on the 1.7 branch


git-svn-id: svn://10.0.0.236/branches/AVIARY_1_0_20040515_BRANCH@157798 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scott%scott-macgregor.org
2004-06-11 19:54:13 +00:00
parent 244185c0c1
commit 415b49472b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/layout/html/base/src/nsBlockFrame.cpp
View File

@@ -2423,14 +2423,17 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
aState.UpdateMaximumWidth(aLine->mMaximumWidth);
// Now reflow the line again this time without having it compute
// the maximum width.
// We leave whether to compute max-element-width as-is, because
// making this call throws out the previous max-element-width
// information stored in the float cache.
// the maximum width or max-element-width.
// Note: we need to reset both member variables, because the inline
// code examines mComputeMaxElementWidth and if there is a placeholder
// on this line the code to reflow the float looks at both...
nscoord oldComputeMaxElementWidth = aState.GetFlag(BRS_COMPUTEMAXELEMENTWIDTH);
nscoord oldComputeMaximumWidth = aState.GetFlag(BRS_COMPUTEMAXWIDTH);
aState.SetFlag(BRS_COMPUTEMAXELEMENTWIDTH, PR_FALSE);
aState.SetFlag(BRS_COMPUTEMAXWIDTH, PR_FALSE);
rv = ReflowInlineFrames(aState, aLine, aKeepReflowGoing, aDamageDirtyArea);
aState.SetFlag(BRS_COMPUTEMAXELEMENTWIDTH, oldComputeMaxElementWidth);
aState.SetFlag(BRS_COMPUTEMAXWIDTH, oldComputeMaximumWidth);
} else {