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

Bug 395316 - Clear OutOfFlowFrame after unregistering placeholder, and make recursive call to RemoveFrame. r/sr/a=roc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@237161 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dholbert%cs.stanford.edu 2007-10-03 03:44:18 +00:00
parent 36cb680bd8
commit 1a0935b276
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9385,6 +9385,7 @@ static void UnregisterPlaceholderChain(nsFrameManager* frameManager,
nsPlaceholderFrame* curFrame = placeholderFrame;
do {
frameManager->UnregisterPlaceholderFrame(curFrame);
curFrame->SetOutOfFlowFrame(nsnull);
curFrame = static_cast<nsPlaceholderFrame*>(curFrame->GetNextContinuation());
} while (curFrame);
}

9
mozilla/layout/generic/nsContainerFrame.cpp
View File

@ -224,7 +224,14 @@ nsContainerFrame::RemoveFrame(nsIAtom* aListName,
// check the overflow lists atm, but we'll need a prescontext lookup
// for overflow containers once we can split abspos elements with
// inline containing blocks.
parent->mFrames.DestroyFrame(aOldFrame);
if (parent == this) {
parent->mFrames.DestroyFrame(aOldFrame);
} else {
// This recursive call takes care of all continuations after aOldFrame,
// so we don't need to loop anymore.
parent->RemoveFrame(nsnull, aOldFrame);
break;
}
aOldFrame = oldFrameNextContinuation;
if (aOldFrame) {
parent = static_cast<nsContainerFrame*>(aOldFrame->GetParent());