зеркало из https://github.com/mozilla/gecko-dev.git
complain if callers try to unregister a null window (it was being done, and I got bushwhacked by it). bug 98792 r=alecf,ccarlen
This commit is contained in:
Родитель
6fcb8d4a5f
Коммит
609165b77b
|
@ -816,9 +816,6 @@ nsAppShellService::RegisterTopLevelWindow(nsIXULWindow* aWindow)
|
|||
}
|
||||
|
||||
|
||||
#define SOMEBODY_SET_UP_US_THE_NULL_POINTER 1
|
||||
// to be turned off once we fix callers who do that to us
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsAppShellService::UnregisterTopLevelWindow(nsIXULWindow* aWindow)
|
||||
{
|
||||
|
@ -836,11 +833,7 @@ nsAppShellService::UnregisterTopLevelWindow(nsIXULWindow* aWindow)
|
|||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
#ifdef SOMEBODY_SET_UP_US_THE_NULL_POINTER
|
||||
if (aWindow) {
|
||||
#else
|
||||
NS_ENSURE_ARG_POINTER(aWindow);
|
||||
#endif
|
||||
|
||||
// tell the window mediator
|
||||
if (mWindowMediator) {
|
||||
|
@ -862,9 +855,6 @@ nsAppShellService::UnregisterTopLevelWindow(nsIXULWindow* aWindow)
|
|||
mWindowWatcher->RemoveWindow(domWindow);
|
||||
}
|
||||
}
|
||||
#ifdef SOMEBODY_SET_UP_US_THE_NULL_POINTER
|
||||
}
|
||||
#endif
|
||||
|
||||
// now quit if the last window has been unregistered (unless we shouldn't)
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче