corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 290297. Reconstruct previous margin after propagating float damage, in case that dirties the line. r+sr=dbaron,a=asa

Browse Source
This commit is contained in:
roc+@cs.cmu.edu
2005-04-20 21:45:24 +00:00
parent b7d827c46d
commit c9224c3a60
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
layout/generic/nsBlockFrame.cpp
View File

@@ -2205,8 +2205,12 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState, PRBool aTryPull)
line->MarkDirty();
}
// Make sure |aState.mPrevBottomMargin| is at the correct position
// before calling PropagateFloatDamage.
if (!line->IsDirty()) {
// See if there's any reflow damage that requires that we mark the
// line dirty.
PropagateFloatDamage(aState, line, deltaY);
}
if (needToRecoverState && line->IsDirty()) {
// We need to reconstruct the bottom margin only if we didn't
// reflow the previous line and we do need to reflow (or repair
@@ -2214,12 +2218,6 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState, PRBool aTryPull)
aState.ReconstructMarginAbove(line);
}
if (!line->IsDirty()) {
// See if there's any reflow damage that requires that we mark the
// line dirty.
PropagateFloatDamage(aState, line, deltaY);
}
if (needToRecoverState) {
needToRecoverState = PR_FALSE;