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

Patch from jst@citec.fi r=troy@netscape.com

Browse Source 
Part of a fix for crash when expanding/collapsing toolbars. Change to
DeletingFrameSubtree() to make sure it examines the additional child
list as well as the principal child list
This commit is contained in:
troy%netscape.com 1999-10-15 03:37:10 +00:00
parent 111c4ee608
commit 98ee25447f
2 changed files with 118 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/base/nsCSSFrameConstructor.cpp
View File

@ -6724,9 +6724,13 @@ DeletingFrameSubtree(nsIPresContext* aPresContext,
aFrameManager->SetPrimaryFrameFor(content, nsnull);
aFrameManager->ClearAllUndisplayedContentIn(content);
nsIAtom* childListName = nsnull;
PRInt32 childListIndex = 0;
do {
// Recursively walk aFrame's child frames looking for placeholder frames
nsIFrame* childFrame;
aFrame->FirstChild(nsnull, &childFrame);
aFrame->FirstChild(childListName, &childFrame);
while (childFrame) {
nsIAtom* frameType;
PRBool isPlaceholder;
@ -6777,6 +6781,10 @@ DeletingFrameSubtree(nsIPresContext* aPresContext,
// Get the next sibling child frame
childFrame->GetNextSibling(&childFrame);
}
NS_IF_RELEASE(childListName);
aFrame->GetAdditionalChildListName(childListIndex++, &childListName);
} while (childListName);
}
return NS_OK;

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

@ -6724,9 +6724,13 @@ DeletingFrameSubtree(nsIPresContext* aPresContext,
aFrameManager->SetPrimaryFrameFor(content, nsnull);
aFrameManager->ClearAllUndisplayedContentIn(content);
nsIAtom* childListName = nsnull;
PRInt32 childListIndex = 0;
do {
// Recursively walk aFrame's child frames looking for placeholder frames
nsIFrame* childFrame;
aFrame->FirstChild(nsnull, &childFrame);
aFrame->FirstChild(childListName, &childFrame);
while (childFrame) {
nsIAtom* frameType;
PRBool isPlaceholder;
@ -6777,6 +6781,10 @@ DeletingFrameSubtree(nsIPresContext* aPresContext,
// Get the next sibling child frame
childFrame->GetNextSibling(&childFrame);
}
NS_IF_RELEASE(childListName);
aFrame->GetAdditionalChildListName(childListIndex++, &childListName);
} while (childListName);
}
return NS_OK;