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

Don't push lines when height is unconstrained, even if current height is bigger than NS_UNCONSTRAINEDSIZE. b=265027 r+sr=roc a=mkaply

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@164194 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org
2004-10-22 17:33:52 +00:00
parent a259d6bc43
commit 897a892fa0
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/layout/generic/nsBlockFrame.cpp
View File

@@ -4178,8 +4178,10 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
// fits; we'll assume it does, so that the maximum width will get
// updated below. The line will be reflowed again and pushed then
// if necessary.
if ((mLines.front() != aLine) && (newY > aState.mBottomEdge)
&& !aUpdateMaximumWidth) {
if (mLines.front() != aLine &&
newY > aState.mBottomEdge &&
aState.mBottomEdge != NS_UNCONSTRAINEDSIZE &&
!aUpdateMaximumWidth) {
// Push this line and all of it's children and anything else that
// follows to our next-in-flow
NS_ASSERTION((aState.mCurrentLine == aLine), "oops");