Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace warning with assert, since this should now never happen. Bug 297850,

Browse Source 
r+sr=dbaron


git-svn-id: svn://10.0.0.236/trunk@177844 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu 2005-08-16 14:39:08 +00:00
parent 8b4fac2399
commit 35e2c59780
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/layout/generic/nsFrame.cpp
View File

@ -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);