From bbe47c39fb8aea91e75d4e4f4c44f3c64a2fb3fb Mon Sep 17 00:00:00 2001 From: "roc+%cs.cmu.edu" Date: Thu, 16 Jun 2005 02:54:57 +0000 Subject: [PATCH] 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 git-svn-id: svn://10.0.0.236/trunk@174665 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsBlockFrame.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index 13a2f941c7f..656b60d0346 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -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. }