Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 06:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Split overflow areas for block frame float continuations. (Bug 542595, patch 12) r=roc a2.0=blocking2.0:beta8

Browse Source
This commit is contained in:
L. David Baron 2010-10-06 21:25:45 -07:00
parent bd2bd8bb96
commit 65fcd4c12c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/generic/nsBlockFrame.cpp
View File

@ -1015,7 +1015,7 @@ nsBlockFrame::Reflow(nsPresContext* aPresContext,
// Drain & handle pushed floats
DrainPushedFloats(state);
nsRect fcBounds;
nsOverflowAreas fcBounds;
nsReflowStatus fcStatus = NS_FRAME_COMPLETE;
rv = ReflowPushedFloats(state, fcBounds, fcStatus);
NS_ENSURE_SUCCESS(rv, rv);
@ -1105,7 +1105,7 @@ nsBlockFrame::Reflow(nsPresContext* aPresContext,
// Factor overflow container child bounds into the overflow area
aMetrics.mOverflowAreas.UnionWith(ocBounds);
// Factor pushed float child bounds into the overflow area
aMetrics.mOverflowArea.UnionRect(aMetrics.mOverflowArea, fcBounds);
aMetrics.mOverflowAreas.UnionWith(fcBounds);
// Let the absolutely positioned container reflow any absolutely positioned
// child frames that need to be reflowed, e.g., elements with a percentage
@ -5802,8 +5802,8 @@ nsBlockFrame::FindTrailingClear()
nsresult
nsBlockFrame::ReflowPushedFloats(nsBlockReflowState& aState,
nsRect& aBounds,
nsReflowStatus& aStatus)
nsOverflowAreas& aOverflowAreas,
nsReflowStatus& aStatus)
{
nsresult rv = NS_OK;
for (nsIFrame* f = mFloats.FirstChild(), *next;
@ -5841,7 +5841,7 @@ nsBlockFrame::ReflowPushedFloats(nsBlockReflowState& aState,
NS_MergeReflowStatusInto(&aStatus, NS_FRAME_OVERFLOW_INCOMPLETE);
}
ConsiderChildOverflow(aBounds, f);
ConsiderChildOverflow(aOverflowAreas, f);
}
// If there are continued floats, then we may need to continue BR clearance

4
layout/generic/nsBlockFrame.h
View File

@ -477,8 +477,8 @@ protected:
/** Reflow pushed floats
*/
nsresult ReflowPushedFloats(nsBlockReflowState& aState,
nsRect& aBounds,
nsReflowStatus& aStatus);
nsOverflowAreas& aOverflowAreas,
nsReflowStatus& aStatus);
/** Find any trailing BR clear from the last line of the block (or its PIFs)
*/