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

Bug 388064, remove extra active popup list from presshell, since popup manager now tracks popups, and does so for all popups, r+sr=roc

Browse Source
This commit is contained in:
2007-07-16 07:53:32 -07:00
parent dbf259a69a
commit af2ab2c6b6
5 changed files with 35 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
layout/xul/base/src/nsMenuPopupFrame.cpp
View File

@@ -512,7 +512,6 @@ nsMenuPopupFrame::ShowPopup(PRBool aIsContextMenu, PRBool aSelectFirstItem)
(static_cast<nsMenuFrame*>(parent))->PopupOpened();
if (!weakFrame.IsAlive())
return PR_FALSE;
PresContext()->RootPresContext()->NotifyAddedActivePopupToTop(this);
}
// the frames for the child menus have not been created yet, so tell the
@@ -568,7 +567,6 @@ nsMenuPopupFrame::HidePopup(PRBool aDeselectMenu)
nsIFrame* parent = GetParent();
if (parent && parent->GetType() == nsGkAtoms::menuFrame) {
(static_cast<nsMenuFrame*>(parent))->PopupClosed(aDeselectMenu);
PresContext()->RootPresContext()->NotifyRemovedActivePopup(this);
}
}
@@ -1631,11 +1629,6 @@ nsMenuPopupFrame::Destroy()
if (pm)
pm->PopupDestroyed(this);
nsPresContext* rootPresContext = PresContext()->RootPresContext();
if (rootPresContext->ContainsActivePopup(this)) {
rootPresContext->NotifyRemovedActivePopup(this);
}
nsBoxFrame::Destroy();
}