зеркало из https://github.com/mozilla/pjs.git
Bug 386266: Crash [@ nsFrameManager::UnregisterPlaceholderFrame] or assertions with -moz-column and float. r+sr=bzbarsky, a=blocking1.9+
This commit is contained in:
Родитель
2baae2fe04
Коммит
3b1c1abb87
|
@ -9436,6 +9436,17 @@ nsCSSFrameConstructor::RemoveMappingsForFrameSubtree(nsIFrame* aRemovedFrame)
|
||||||
return ::DeletingFrameSubtree(mPresShell->FrameManager(), aRemovedFrame);
|
return ::DeletingFrameSubtree(mPresShell->FrameManager(), aRemovedFrame);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void UnregisterPlaceholderChain(nsFrameManager* frameManager,
|
||||||
|
nsPlaceholderFrame* placeholderFrame)
|
||||||
|
{
|
||||||
|
// Remove the mapping from the frame to its placeholder
|
||||||
|
nsPlaceholderFrame* curFrame = placeholderFrame;
|
||||||
|
do {
|
||||||
|
frameManager->UnregisterPlaceholderFrame(curFrame);
|
||||||
|
curFrame = static_cast<nsPlaceholderFrame*>(curFrame->GetNextContinuation());
|
||||||
|
} while (curFrame);
|
||||||
|
}
|
||||||
|
|
||||||
nsresult
|
nsresult
|
||||||
nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
|
nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
|
||||||
nsIContent* aChild,
|
nsIContent* aChild,
|
||||||
|
@ -9574,8 +9585,7 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
|
||||||
frameManager->GetPlaceholderFrameFor(childFrame);
|
frameManager->GetPlaceholderFrameFor(childFrame);
|
||||||
NS_ASSERTION(placeholderFrame, "No placeholder for out-of-flow?");
|
NS_ASSERTION(placeholderFrame, "No placeholder for out-of-flow?");
|
||||||
|
|
||||||
// Remove the mapping from the frame to its placeholder
|
UnregisterPlaceholderChain(frameManager, placeholderFrame);
|
||||||
frameManager->UnregisterPlaceholderFrame(placeholderFrame);
|
|
||||||
|
|
||||||
// Now we remove the out-of-flow frame
|
// Now we remove the out-of-flow frame
|
||||||
// XXX has to be done first for now: for floats, the block's line list
|
// XXX has to be done first for now: for floats, the block's line list
|
||||||
|
@ -12105,9 +12115,8 @@ nsCSSFrameConstructor::RemoveFloatingFirstLetterFrames(
|
||||||
printf("RemoveFloatingFirstLetterFrames: textContent=%p oldTextFrame=%p newTextFrame=%p\n",
|
printf("RemoveFloatingFirstLetterFrames: textContent=%p oldTextFrame=%p newTextFrame=%p\n",
|
||||||
textContent.get(), textFrame, newTextFrame);
|
textContent.get(), textFrame, newTextFrame);
|
||||||
#endif
|
#endif
|
||||||
// Should we call DeletingFrameSubtree on the placeholder instead
|
|
||||||
// and skip this call?
|
UnregisterPlaceholderChain(aFrameManager, placeholderFrame);
|
||||||
aFrameManager->UnregisterPlaceholderFrame(placeholderFrame);
|
|
||||||
|
|
||||||
// Remove the float frame
|
// Remove the float frame
|
||||||
::DeletingFrameSubtree(aFrameManager, floatFrame);
|
::DeletingFrameSubtree(aFrameManager, floatFrame);
|
||||||
|
@ -12115,6 +12124,7 @@ nsCSSFrameConstructor::RemoveFloatingFirstLetterFrames(
|
||||||
floatFrame);
|
floatFrame);
|
||||||
|
|
||||||
// Remove placeholder frame
|
// Remove placeholder frame
|
||||||
|
::DeletingFrameSubtree(aFrameManager, placeholderFrame);
|
||||||
aFrameManager->RemoveFrame(parentFrame, nsnull, placeholderFrame);
|
aFrameManager->RemoveFrame(parentFrame, nsnull, placeholderFrame);
|
||||||
|
|
||||||
// Insert text frame in its place
|
// Insert text frame in its place
|
||||||
|
@ -12862,14 +12872,13 @@ nsresult nsCSSFrameConstructor::RemoveFixedItems(const nsFrameConstructorState&
|
||||||
if (fixedChild) {
|
if (fixedChild) {
|
||||||
// Remove the placeholder so it doesn't end up sitting about pointing
|
// Remove the placeholder so it doesn't end up sitting about pointing
|
||||||
// to the removed fixed frame.
|
// to the removed fixed frame.
|
||||||
nsIFrame *placeholderFrame;
|
nsPlaceholderFrame *placeholderFrame =
|
||||||
mPresShell->GetPlaceholderFrameFor(fixedChild, &placeholderFrame);
|
aState.mFrameManager->GetPlaceholderFrameFor(fixedChild);
|
||||||
NS_ASSERTION(placeholderFrame, "no placeholder for fixed-pos frame");
|
NS_ASSERTION(placeholderFrame, "no placeholder for fixed-pos frame");
|
||||||
NS_ASSERTION(placeholderFrame->GetType() ==
|
NS_ASSERTION(placeholderFrame->GetType() ==
|
||||||
nsGkAtoms::placeholderFrame,
|
nsGkAtoms::placeholderFrame,
|
||||||
"Wrong type");
|
"Wrong type");
|
||||||
aState.mFrameManager->UnregisterPlaceholderFrame(
|
UnregisterPlaceholderChain(aState.mFrameManager, placeholderFrame);
|
||||||
static_cast<nsPlaceholderFrame*>(placeholderFrame));
|
|
||||||
nsIFrame* placeholderParent = placeholderFrame->GetParent();
|
nsIFrame* placeholderParent = placeholderFrame->GetParent();
|
||||||
::DeletingFrameSubtree(aState.mFrameManager, placeholderFrame);
|
::DeletingFrameSubtree(aState.mFrameManager, placeholderFrame);
|
||||||
rv = aState.mFrameManager->RemoveFrame(placeholderParent, nsnull,
|
rv = aState.mFrameManager->RemoveFrame(placeholderParent, nsnull,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче