From 3bc37fa97f8fd184a8b3f93c889a056243944e99 Mon Sep 17 00:00:00 2001 From: "fantasai.cvs@inkedblade.net" Date: Mon, 12 Nov 2007 11:05:42 -0800 Subject: [PATCH] update last continuation assertion to account for overflow container continuations b=399687 r+sr=roc a=beltzner --- layout/base/nsFrameManager.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/layout/base/nsFrameManager.cpp b/layout/base/nsFrameManager.cpp index b6d1c63ae14e..26ebf22e22b7 100644 --- a/layout/base/nsFrameManager.cpp +++ b/layout/base/nsFrameManager.cpp @@ -59,6 +59,7 @@ #include "prthread.h" #include "plhash.h" #include "nsPlaceholderFrame.h" +#include "nsContainerFrame.h" #include "nsBlockFrame.h" #include "nsGkAtoms.h" #include "nsCSSAnonBoxes.h" @@ -669,7 +670,9 @@ nsFrameManager::InsertFrames(nsIFrame* aParentFrame, nsIFrame* aPrevFrame, nsIFrame* aFrameList) { - NS_PRECONDITION(!aPrevFrame || !aPrevFrame->GetNextContinuation(), + NS_PRECONDITION(!aPrevFrame || (!aPrevFrame->GetNextContinuation() + || IS_TRUE_OVERFLOW_CONTAINER(aPrevFrame->GetNextContinuation())) + && !IS_TRUE_OVERFLOW_CONTAINER(aPrevFrame), "aPrevFrame must be the last continuation in its chain!"); return aParentFrame->InsertFrames(aListName, aPrevFrame, aFrameList);