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

Bug 292295. Blocks with clearance are not actually top-margin-roots. Their top margin is still managed by the parent block if there is one. Fixes an Acid2 issue. r+sr=dbaron,a=asa

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@174665 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
roc+%cs.cmu.edu
2005-06-16 02:54:57 +00:00
parent d5412845ee
commit bbe47c39fb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -734,7 +734,7 @@ nsBlockFrame::Reflow(nsPresContext* aPresContext,
}
nsBlockReflowState state(aReflowState, aPresContext, this, aMetrics,
aReflowState.mFlags.mHasClearance || (NS_BLOCK_MARGIN_ROOT & mState),
(NS_BLOCK_MARGIN_ROOT & mState),
(NS_BLOCK_MARGIN_ROOT & mState));
// The condition for doing Bidi resolutions includes a test for the
@@ -3239,7 +3239,7 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
// Only record the first frame that requires clearance
if (!*aState.mReflowState.mDiscoveredClearance) {
*aState.mReflowState.mDiscoveredClearance = frame;
}
}
// Exactly what we do now is flexible since we'll definitely be
// reflowed.
}