From 64ce76c9aafcdeb130af2c0999eb688bb52df1ad Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Fri, 23 Sep 2005 19:11:29 +0000 Subject: [PATCH] Fix nsCSSFrameConstructor::ContentRemoved to properly deal with out-of-flows whose placeholders are in an insertion point. Bug 288790, r+sr=dbaron, a=asa git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@180880 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/nsCSSFrameConstructor.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index 7095865de0a..ee407c1c521 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -9671,16 +9671,6 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer, // Get the childFrame's parent frame nsIFrame* parentFrame = childFrame->GetParent(); - // See if we have an XBL insertion point. If so, then that's our - // real parent frame; if not, then the frame hasn't been built yet - // and we just bail. - nsIFrame* insertionPoint; - GetInsertionPoint(parentFrame, aChild, &insertionPoint); - if (! insertionPoint) - return NS_OK; - - parentFrame = insertionPoint; - if (parentFrame->GetType() == nsLayoutAtoms::frameSetFrame) { // Just reframe the parent, since framesets are weird like that. return RecreateFramesForContent(parentFrame->GetContent()); @@ -9854,7 +9844,7 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer, childFrame); } else { - rv = frameManager->RemoveFrame(insertionPoint, nsnull, childFrame); + rv = frameManager->RemoveFrame(parentFrame, nsnull, childFrame); } }