wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bail out of ReconstructDocElementHierarchy early if there is no root frame(which shouldn't even happen!). Bug 377850, r=mats, sr=dbaron

Browse Source
This commit is contained in:
bzbarsky@mit.edu 2007-05-04 23:12:44 -07:00
parent 64c3e5df8a
commit 67c2d05514
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
layout/base/nsCSSFrameConstructor.cpp
View File

@ -7645,6 +7645,10 @@ nsCSSFrameConstructor::ReconstructDocElementHierarchyInternal()
// Get the frame that corresponds to the document element
nsIFrame* docElementFrame =
state.mFrameManager->GetPrimaryFrameFor(rootContent, -1);
if (!docElementFrame) {
NS_NOTREACHED("Really should have doc element frame here");
return NS_ERROR_UNEXPECTED;
}
// Remove any existing fixed items: they are always on the
// FixedContainingBlock. Note that this has to be done before we call
@ -7658,21 +7662,18 @@ nsCSSFrameConstructor::ReconstructDocElementHierarchyInternal()
state.mFrameManager->ClearPlaceholderFrameMap();
state.mFrameManager->ClearUndisplayedContentMap();
if (docElementFrame) {
// Take the docElementFrame, and remove it from its parent.
// Take the docElementFrame, and remove it from its parent.
// XXXbz So why can't we reuse ContentRemoved?
// XXXbz So why can't we reuse ContentRemoved?
NS_ASSERTION(docElementFrame->GetParent() == mDocElementContainingBlock,
"Unexpected doc element parent frame");
// Remove the old document element hieararchy
rv = state.mFrameManager->RemoveFrame(mDocElementContainingBlock,
nsnull, docElementFrame);
if (NS_FAILED(rv)) {
return rv;
}
NS_ASSERTION(docElementFrame->GetParent() == mDocElementContainingBlock,
"Unexpected doc element parent frame");
// Remove the old document element hieararchy
rv = state.mFrameManager->RemoveFrame(mDocElementContainingBlock,
nsnull, docElementFrame);
if (NS_FAILED(rv)) {
return rv;
}
// Create the new document element hierarchy