Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-29 21:25:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

b=17798. Changed WipeContainingBlock() to remove the frames it is deleting from

Browse Source 
the content to frame map and undisplayed content map
This commit is contained in:
troy%netscape.com 1999-11-11 21:08:32 +00:00
parent 7bf4d85822
commit 76b0c270fb
2 changed files with 88 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
layout/base/nsCSSFrameConstructor.cpp
View File

@ -9444,6 +9444,38 @@ nsCSSFrameConstructor::ProcessInlineChildren(nsIPresContext* aPresConte
return rv;
}
// Helper function that walks a framne list and recursively removed content to
// frame mappings and undisplayed content mappings.
// This differs from DeletingFrameSubtree() because the frames have no yet been
// added to the frame hierarchy
static void
CleanupFrameReferences(nsIFrameManager* aFrameManager,
nsIFrame* aFrameList)
{
while (aFrameList) {
nsCOMPtr<nsIContent> content;
aFrameList->GetContent(getter_AddRefs(content));
// Remove the mapping from the content object to its frame
aFrameManager->SetPrimaryFrameFor(content, nsnull);
aFrameManager->ClearAllUndisplayedContentIn(content);
// Recursively walk the child frames.
// Note: we only need to look at the principal child list
nsIFrame* childFrame;
aFrameList->FirstChild(nsnull, &childFrame);
while (childFrame) {
CleanupFrameReferences(aFrameManager, childFrame);
// Get the next sibling child frame
childFrame->GetNextSibling(&childFrame);
}
// Get the sibling frame
aFrameList->GetNextSibling(&aFrameList);
}
}
PRBool
nsCSSFrameConstructor::WipeContainingBlock(nsIPresContext* aPresContext,
nsFrameConstructorState& aState,
@ -9460,17 +9492,29 @@ nsCSSFrameConstructor::WipeContainingBlock(nsIPresContext* aPresContext,
if (NS_STYLE_DISPLAY_INLINE == parentDisplay->mDisplay) {
if (!AreAllKidsInline(aFrameList)) {
// Ok, reverse tracks: wipe out the frames we just created
nsCOMPtr<nsIPresShell> presShell;
nsCOMPtr<nsIFrameManager> frameManager;
aPresContext->GetShell(getter_AddRefs(presShell));
presShell->GetFrameManager(getter_AddRefs(frameManager));
// Destroy the frames. As we do make sure any content to frame mappings
// or entries in the undisplayed content map are removed
CleanupFrameReferences(frameManager, aFrameList);
nsFrameList tmp(aFrameList);
tmp.DestroyFrames(*aPresContext);
if (aState.mAbsoluteItems.childList) {
CleanupFrameReferences(frameManager, aState.mAbsoluteItems.childList);
tmp.SetFrames(aState.mAbsoluteItems.childList);
tmp.DestroyFrames(*aPresContext);
}
if (aState.mFixedItems.childList) {
CleanupFrameReferences(frameManager, aState.mFixedItems.childList);
tmp.SetFrames(aState.mFixedItems.childList);
tmp.DestroyFrames(*aPresContext);
}
if (aState.mFloatedItems.childList) {
CleanupFrameReferences(frameManager, aState.mFloatedItems.childList);
tmp.SetFrames(aState.mFloatedItems.childList);
tmp.DestroyFrames(*aPresContext);
}

44
layout/html/style/src/nsCSSFrameConstructor.cpp
View File

@ -9444,6 +9444,38 @@ nsCSSFrameConstructor::ProcessInlineChildren(nsIPresContext* aPresConte
return rv;
}
// Helper function that walks a framne list and recursively removed content to
// frame mappings and undisplayed content mappings.
// This differs from DeletingFrameSubtree() because the frames have no yet been
// added to the frame hierarchy
static void
CleanupFrameReferences(nsIFrameManager* aFrameManager,
nsIFrame* aFrameList)
{
while (aFrameList) {
nsCOMPtr<nsIContent> content;
aFrameList->GetContent(getter_AddRefs(content));
// Remove the mapping from the content object to its frame
aFrameManager->SetPrimaryFrameFor(content, nsnull);
aFrameManager->ClearAllUndisplayedContentIn(content);
// Recursively walk the child frames.
// Note: we only need to look at the principal child list
nsIFrame* childFrame;
aFrameList->FirstChild(nsnull, &childFrame);
while (childFrame) {
CleanupFrameReferences(aFrameManager, childFrame);
// Get the next sibling child frame
childFrame->GetNextSibling(&childFrame);
}
// Get the sibling frame
aFrameList->GetNextSibling(&aFrameList);
}
}
PRBool
nsCSSFrameConstructor::WipeContainingBlock(nsIPresContext* aPresContext,
nsFrameConstructorState& aState,
@ -9460,17 +9492,29 @@ nsCSSFrameConstructor::WipeContainingBlock(nsIPresContext* aPresContext,
if (NS_STYLE_DISPLAY_INLINE == parentDisplay->mDisplay) {
if (!AreAllKidsInline(aFrameList)) {
// Ok, reverse tracks: wipe out the frames we just created
nsCOMPtr<nsIPresShell> presShell;
nsCOMPtr<nsIFrameManager> frameManager;
aPresContext->GetShell(getter_AddRefs(presShell));
presShell->GetFrameManager(getter_AddRefs(frameManager));
// Destroy the frames. As we do make sure any content to frame mappings
// or entries in the undisplayed content map are removed
CleanupFrameReferences(frameManager, aFrameList);
nsFrameList tmp(aFrameList);
tmp.DestroyFrames(*aPresContext);
if (aState.mAbsoluteItems.childList) {
CleanupFrameReferences(frameManager, aState.mAbsoluteItems.childList);
tmp.SetFrames(aState.mAbsoluteItems.childList);
tmp.DestroyFrames(*aPresContext);
}
if (aState.mFixedItems.childList) {
CleanupFrameReferences(frameManager, aState.mFixedItems.childList);
tmp.SetFrames(aState.mFixedItems.childList);
tmp.DestroyFrames(*aPresContext);
}
if (aState.mFloatedItems.childList) {
CleanupFrameReferences(frameManager, aState.mFloatedItems.childList);
tmp.SetFrames(aState.mFloatedItems.childList);
tmp.DestroyFrames(*aPresContext);
}