From 9599929a93d0f643c5a01e779f6436d643af26b5 Mon Sep 17 00:00:00 2001 From: Robert O'Callahan Date: Mon, 8 Dec 2008 13:39:11 +1300 Subject: [PATCH] Bug 465913. Don't need to call BreakFromPrevInFlow in nsContainerFrame::DeleteNextInFlowChild. r+sr=dbaron --- layout/generic/nsContainerFrame.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp index f5fa54036ec4..998d204bb18e 100644 --- a/layout/generic/nsContainerFrame.cpp +++ b/layout/generic/nsContainerFrame.cpp @@ -1133,9 +1133,6 @@ nsContainerFrame::DeleteNextInFlowChild(nsPresContext* aPresContext, aNextInFlow->Invalidate(aNextInFlow->GetOverflowRect()); - // Disconnect the next-in-flow from the flow list - nsSplittableFrame::BreakFromPrevFlow(aNextInFlow); - // Take the next-in-flow out of the parent's child list #ifdef DEBUG nsresult rv = @@ -1143,7 +1140,8 @@ nsContainerFrame::DeleteNextInFlowChild(nsPresContext* aPresContext, StealFrame(aPresContext, aNextInFlow); NS_ASSERTION(NS_SUCCEEDED(rv), "StealFrame failure"); - // Delete the next-in-flow frame and its descendants. + // Delete the next-in-flow frame and its descendants. This will also + // remove it from its next-in-flow/prev-in-flow chain. aNextInFlow->Destroy(); NS_POSTCONDITION(!prevInFlow->GetNextInFlow(), "non null next-in-flow");