From 80e17d2c14a6c5167a918c447af0b6b3f7064103 Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Mon, 17 Apr 2006 01:40:14 +0000 Subject: [PATCH] Unregister our placeholder before destroying it. Bug 316267, r+sr=dbaron git-svn-id: svn://10.0.0.236/trunk@194489 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/nsCSSFrameConstructor.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index 6f18d009562..e0030baf4df 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -13320,6 +13320,11 @@ nsresult nsCSSFrameConstructor::RemoveFixedItems(const nsFrameConstructorState& nsIFrame *placeholderFrame; mPresShell->GetPlaceholderFrameFor(fixedChild, &placeholderFrame); NS_ASSERTION(placeholderFrame, "no placeholder for fixed-pos frame"); + NS_ASSERTION(placeholderFrame->GetType() == + nsLayoutAtoms::placeholderFrame, + "Wrong type"); + aState.mFrameManager->UnregisterPlaceholderFrame( + NS_STATIC_CAST(nsPlaceholderFrame*, placeholderFrame)); nsIFrame* placeholderParent = placeholderFrame->GetParent(); ::DeletingFrameSubtree(aState.mFrameManager, placeholderFrame); rv = aState.mFrameManager->RemoveFrame(placeholderParent, nsnull,