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

Bug 696745, remove nsIMenuRollup and xul-popup-manager component, r=mats,sr=roc

Browse Source
This commit is contained in:
Neil Deakin
2011-11-08 14:59:07 -05:00
parent f5f42599ce
commit cc508ba376
29 changed files with 111 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
layout/forms/nsComboboxControlFrame.cpp
View File

@@ -473,7 +473,7 @@ nsComboboxControlFrame::ShowList(bool aShowList)
if (view) {
nsIWidget* widget = view->GetWidget();
if (widget) {
widget->CaptureRollupEvents(this, nsnull, mDroppedDown, mDroppedDown);
widget->CaptureRollupEvents(this, mDroppedDown, mDroppedDown);
if (!aShowList) {
nsCOMPtr<nsIRunnable> widgetDestroyer =
@@ -1322,7 +1322,7 @@ nsComboboxControlFrame::DestroyFrom(nsIFrame* aDestructRoot)
if (view) {
nsIWidget* widget = view->GetWidget();
if (widget)
widget->CaptureRollupEvents(this, nsnull, false, true);
widget->CaptureRollupEvents(this, false, true);
}
}
}
@@ -1375,24 +1375,21 @@ nsComboboxControlFrame::SetInitialChildList(ChildListID aListID,
//----------------------------------------------------------------------
//nsIRollupListener
//----------------------------------------------------------------------
NS_IMETHODIMP
nsComboboxControlFrame::Rollup(PRUint32 aCount,
nsIContent** aLastRolledUp)
nsIContent*
nsComboboxControlFrame::Rollup(PRUint32 aCount, bool aGetLastRolledUp)
{
if (aLastRolledUp)
*aLastRolledUp = nsnull;
if (mDroppedDown) {
nsWeakFrame weakFrame(this);
mListControlFrame->AboutToRollup(); // might destroy us
if (!weakFrame.IsAlive())
return NS_OK;
return nsnull;
ShowDropDown(false); // might destroy us
if (!weakFrame.IsAlive())
return NS_OK;
return nsnull;
mListControlFrame->CaptureMouseEvents(false);
}
return NS_OK;
return nsnull;
}
void