From 3d3c6b66215f55698961dac81ec92dc24b7f8f87 Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Tue, 16 Aug 2005 14:39:08 +0000 Subject: [PATCH] Replace warning with assert, since this should now never happen. Bug 297850, r+sr=dbaron --- layout/generic/nsFrame.cpp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index 42b553ed0f30..8ab25052492a 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -634,19 +634,9 @@ nsFrame::Destroy(nsPresContext* aPresContext) nsIPresShell *shell = aPresContext->GetPresShell(); if (shell) { - if (mState & NS_FRAME_OUT_OF_FLOW) { - nsPlaceholderFrame* placeholder - = shell->FrameManager()->GetPlaceholderFrameFor(this); - if (placeholder) { - NS_WARNING("Deleting out of flow without tearing down placeholder relationship"); - if (placeholder->GetOutOfFlowFrame()) { - NS_ASSERTION(placeholder->GetOutOfFlowFrame() == this, - "no-one told the frame manager about this"); - shell->FrameManager()->UnregisterPlaceholderFrame(placeholder); - placeholder->SetOutOfFlowFrame(nsnull); - } - } - } + NS_ASSERTION(!(mState & NS_FRAME_OUT_OF_FLOW) || + !shell->FrameManager()->GetPlaceholderFrameFor(this), + "Deleting out of flow without tearing down placeholder relationship"); shell->NotifyDestroyingFrame(this);