complain if callers try to unregister a null window (it was being done, and I got bushwhacked by it). bug 98792 r=alecf,ccarlen
git-svn-id: svn://10.0.0.236/trunk@102699 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user