From 8a92691371fbaff65516b34e01500de83e53b17d Mon Sep 17 00:00:00 2001 From: "roc+%cs.cmu.edu" Date: Mon, 3 Dec 2007 04:25:02 +0000 Subject: [PATCH] Bug 406297. Assertion about stale float caches should not fire when the line is not dirty, because the float cache is not stale in that case. r+sr+a=dbaron git-svn-id: svn://10.0.0.236/trunk@240272 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsBlockFrame.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index 815c3b17d2f..0f857c9816c 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -1948,7 +1948,8 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState) repositionViews = PR_TRUE; if (willReflowAgain) { - NS_ASSERTION(!line->HasFloats(), "Possibly stale float cache here!"); + NS_ASSERTION(!line->IsDirty() || !line->HasFloats(), + "Possibly stale float cache here!"); // If we're going to reflow everything again, and this line has no // cached floats, then there is no need to recover float state. The line // may be a block that contains other lines with floats, but in that