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

Make ReconstructDocElementHierarchy work correctly even if we first blew away a

Browse Source 
pseudo which had the root as its content.  Bug 343293, r+sr=roc


git-svn-id: svn://10.0.0.236/trunk@216439 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2006-12-04 20:35:55 +00:00
parent 40660adb9d
commit e1eaaf62ed
4 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/layout/base/nsCSSFrameConstructor.cpp
View File

@@ -667,8 +667,7 @@ DoCleanupFrameReferences(nsFrameManager* aFrameManager,
}
// Remove the mapping from the content object to its frame
aFrameManager->SetPrimaryFrameFor(content, nsnull);
aFrameIn->RemovedAsPrimaryFrame();
aFrameManager->RemoveAsPrimaryFrame(content, aFrameIn);
aFrameManager->ClearAllUndisplayedContentIn(content);
// Recursively walk the child frames.
@@ -9620,8 +9619,7 @@ DoDeletingFrameSubtree(nsFrameManager* aFrameManager,
// Remove the mapping from the content object to its frame.
nsIContent* content = aFrame->GetContent();
if (content) {
aFrameManager->SetPrimaryFrameFor(content, nsnull);
aFrame->RemovedAsPrimaryFrame();
aFrameManager->RemoveAsPrimaryFrame(content, aFrame);
aFrameManager->ClearAllUndisplayedContentIn(content);
}