Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-10 01:08:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix nsCSSFrameConstructor::ContentRemoved to properly deal with out-of-flows

Browse Source 
whose placeholders are in an insertion point.  Bug 288790, r+sr=dbaron
This commit is contained in:
bzbarsky%mit.edu 2005-09-23 14:48:08 +00:00
parent 242b21fdb5
commit b2c9978aed
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
layout/base/nsCSSFrameConstructor.cpp
View File

@ -9768,16 +9768,6 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
// Get the childFrame's parent frame
nsIFrame* parentFrame = childFrame->GetParent();
// See if we have an XBL insertion point. If so, then that's our
// real parent frame; if not, then the frame hasn't been built yet
// and we just bail.
nsIFrame* insertionPoint;
GetInsertionPoint(parentFrame, aChild, &insertionPoint);
if (! insertionPoint)
return NS_OK;
parentFrame = insertionPoint;
if (parentFrame->GetType() == nsLayoutAtoms::frameSetFrame) {
// Just reframe the parent, since framesets are weird like that.
return RecreateFramesForContent(parentFrame->GetContent());
@ -9951,7 +9941,7 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
childFrame);
}
else {
rv = frameManager->RemoveFrame(insertionPoint, nsnull, childFrame);
rv = frameManager->RemoveFrame(parentFrame, nsnull, childFrame);
}
}