From cbf12a16e399915215875a76e54d16a1fda51e18 Mon Sep 17 00:00:00 2001 From: "roc+%cs.cmu.edu" Date: Sun, 26 Mar 2006 21:02:19 +0000 Subject: [PATCH] Bug 328946. Mark reflowed block as non-dirty earlier, so we don't get a spurious assertion. r+sr=dbaron git-svn-id: svn://10.0.0.236/trunk@193020 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsBlockReflowContext.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mozilla/layout/generic/nsBlockReflowContext.cpp b/mozilla/layout/generic/nsBlockReflowContext.cpp index b87ca78001b..f6a3c48bd63 100644 --- a/mozilla/layout/generic/nsBlockReflowContext.cpp +++ b/mozilla/layout/generic/nsBlockReflowContext.cpp @@ -777,6 +777,9 @@ nsBlockReflowContext::PlaceBlock(const nsHTMLReflowState& aReflowState, // check that first. Note that a block can have clearance and still // have adjoining top/bottom margins, because the clearance goes // above the top margin. + // Mark the frame as non-dirty; it has been reflowed (or we wouldn't + // be here), and we don't want to assert in CachedIsEmpty() + mFrame->RemoveStateBits(NS_FRAME_IS_DIRTY); PRBool empty = 0 == mMetrics.height && aLine->CachedIsEmpty(); if (empty) { // Collapse the bottom margin with the top margin that was already