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

no math with NS_UNCONSTRAINEDSIZE please, bug 14862 r=karnaze sr=roc+moz

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@122641 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bernd.mielke%snafu.de
2002-06-04 04:37:06 +00:00
parent 47616d75b2
commit dafbd8aee3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5256,7 +5256,8 @@ nsBlockFrame::ReflowFloater(nsBlockReflowState& aState,
availWidth -= availWidth % twp;
}
}
nscoord availHeight = (NS_UNCONSTRAINEDSIZE == aState.mAvailSpaceRect.height)
nscoord availHeight = ((NS_UNCONSTRAINEDSIZE == aState.mAvailSpaceRect.height) ||
(NS_UNCONSTRAINEDSIZE == aState.mContentArea.height))
? NS_UNCONSTRAINEDSIZE
: PR_MAX(0, aState.mContentArea.height - aState.mY);

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

@@ -5256,7 +5256,8 @@ nsBlockFrame::ReflowFloater(nsBlockReflowState& aState,
availWidth -= availWidth % twp;
}
}
nscoord availHeight = (NS_UNCONSTRAINEDSIZE == aState.mAvailSpaceRect.height)
nscoord availHeight = ((NS_UNCONSTRAINEDSIZE == aState.mAvailSpaceRect.height) ||
(NS_UNCONSTRAINEDSIZE == aState.mContentArea.height))
? NS_UNCONSTRAINEDSIZE
: PR_MAX(0, aState.mContentArea.height - aState.mY);