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

Don't overlap scroll frame margin box with float (regression). b=350046 r+sr=roc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@208474 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mats.palmgren%bredband.net 2006-08-25 22:55:32 +00:00
parent ad80f2b24f
commit f119c67ad5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/layout/generic/nsBlockReflowState.cpp
View File

@ -233,9 +233,10 @@ nsBlockReflowState::ComputeBlockAvailSpace(nsIFrame* aFrame,
// text controls are not splittable
// XXXldb Why not just set the frame state bit?
if ((NS_FRAME_SPLITTABLE_NON_RECTANGULAR == aSplitType || // normal blocks
NS_FRAME_NOT_SPLITTABLE == aSplitType) && // things like images mapped to display: block
!(aFrame->GetStateBits() & NS_FRAME_REPLACED_ELEMENT)) // but not replaced elements
if ((NS_FRAME_SPLITTABLE_NON_RECTANGULAR == aSplitType || // normal blocks
NS_FRAME_NOT_SPLITTABLE == aSplitType) && // things like images mapped to display: block
!(aFrame->GetStateBits() & NS_FRAME_REPLACED_ELEMENT) && // but not replaced elements
aFrame->GetType() != nsLayoutAtoms::scrollFrame) // or scroll frames
{
if (mBand.GetFloatCount()) {
// Use the float-edge property to determine how the child block