corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Call 'RemoveMappingsForFrameSubtree()' before destroying 'mPopupFrames'. b=117984 r+sr=bzbarsky

Browse Source
This commit is contained in:
mats.palmgren@bredband.net
2005-09-20 20:28:02 +00:00
parent 7919619340
commit 58de08aed0
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
layout/forms/nsComboboxControlFrame.cpp
View File

@@ -549,7 +549,6 @@ nsComboboxControlFrame::ShowPopup(PRBool aShowPopup)
nsRect rect = mDropdownFrame->GetRect();
rect.x = rect.y = 0;
viewManager->ResizeView(view, rect);
nsIScrollableView* scrollingView = view->ToScrollableView();
viewManager->SetViewVisibility(view, nsViewVisibility_kShow);
} else {
viewManager->SetViewVisibility(view, nsViewVisibility_kHide);
@@ -2226,15 +2225,18 @@ nsComboboxControlFrame::Destroy(nsPresContext* aPresContext)
}
}
// Cleanup frames in popup child list
nsCSSFrameConstructor* fc = aPresContext->PresShell()->FrameConstructor();
// Cleanup frames in popup child list
for (nsIFrame* child = mPopupFrames.FirstChild(); child; child = child->GetNextSibling()) {
fc->RemoveMappingsForFrameSubtree(child, nsnull);
}
mPopupFrames.DestroyFrames(aPresContext);
if (!mGoodToGo) {
if (mDisplayFrame) {
aPresContext->PresShell()->FrameConstructor()->
RemoveMappingsForFrameSubtree(mDisplayFrame, nsnull);
fc->RemoveMappingsForFrameSubtree(mDisplayFrame, nsnull);
mDisplayFrame->Destroy(aPresContext);
mDisplayFrame=nsnull;
mDisplayFrame = nsnull;
}
}