Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1294553 - Don't pretend that nsCocoaWindow is an interface in nsPIWidgetCocoa.idl, r=mstange

Browse Source 
MozReview-Commit-ID: 4a6UTI4TxV9
This commit is contained in:
Michael Layzell 2016-08-11 17:51:11 -04:00
parent 7cff244225
commit 05d228443c
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
widget/cocoa/nsCocoaWindow.mm
View File

@ -770,8 +770,9 @@ NS_IMETHODIMP nsCocoaWindow::Show(bool bState)
[NSApp endSheet:nativeParentWindow];
}
nsCocoaWindow* sheetShown = nullptr;
if (NS_SUCCEEDED(piParentWidget->GetChildSheet(true, &sheetShown)) &&
nsCOMPtr<nsIWidget> sheetShown;
if (NS_SUCCEEDED(piParentWidget->GetChildSheet(
true, getter_AddRefs(sheetShown))) &&
(!sheetShown || sheetShown == this)) {
// If this sheet is already the sheet actually being shown, don't
// tell it to show again. Otherwise the number of calls to
@ -888,11 +889,12 @@ NS_IMETHODIMP nsCocoaWindow::Show(bool bState)
[TopLevelWindowData deactivateInWindow:mWindow];
nsCocoaWindow* siblingSheetToShow = nullptr;
nsCOMPtr<nsIWidget> siblingSheetToShow;
bool parentIsSheet = false;
if (nativeParentWindow && piParentWidget &&
NS_SUCCEEDED(piParentWidget->GetChildSheet(false, &siblingSheetToShow)) &&
NS_SUCCEEDED(piParentWidget->GetChildSheet(
false, getter_AddRefs(siblingSheetToShow))) &&
siblingSheetToShow) {
// First, give sibling sheets an opportunity to show.
siblingSheetToShow->Show(true);
@ -1842,7 +1844,7 @@ NS_IMETHODIMP nsCocoaWindow::SendSetZLevelEvent()
return NS_OK;
}
NS_IMETHODIMP nsCocoaWindow::GetChildSheet(bool aShown, nsCocoaWindow** _retval)
NS_IMETHODIMP nsCocoaWindow::GetChildSheet(bool aShown, nsIWidget** _retval)
{
nsIWidget* child = GetFirstChild();
@ -1853,7 +1855,8 @@ NS_IMETHODIMP nsCocoaWindow::GetChildSheet(bool aShown, nsCocoaWindow** _retval)
if (cocoaWindow->mWindow &&
((aShown && [cocoaWindow->mWindow isVisible]) ||
(!aShown && cocoaWindow->mSheetNeedsShow))) {
*_retval = cocoaWindow;
nsCOMPtr<nsIWidget> widget = cocoaWindow;
widget.forget(_retval);
return NS_OK;
}
}

4
widget/cocoa/nsPIWidgetCocoa.idl
View File

@ -5,8 +5,6 @@
#include "nsISupports.idl"
interface nsMenuBarX;
interface nsCocoaWindow;
interface nsIWidget;
[ptr] native NSWindowPtr(NSWindow);
@ -24,7 +22,7 @@ interface nsPIWidgetCocoa : nsISupports
// Find the displayed child sheet (if aShown) or a child sheet that
// wants to be displayed (if !aShown)
nsCocoaWindow GetChildSheet(in boolean aShown);
nsIWidget GetChildSheet(in boolean aShown);
// Get the parent widget (if any) StandardCreate() was called with.
nsIWidget GetRealParent();