Bug 587573 - Log image requests to the WebConsole: DocShell fix r=bzbarsky a=blocking2.0

This commit is contained in:
Shawn Wilsher
2010-08-26 09:52:02 -07:00
parent 68b7906011
commit da7de0fd13

View File

@@ -10919,16 +10919,18 @@ nsDocShell::Observe(nsISupports *aSubject, const char *aTopic,
NS_IMETHODIMP
nsDocShell::GetAssociatedWindow(nsIDOMWindow** aWindow)
{
return CallGetInterface(this, aWindow);
CallGetInterface(this, aWindow);
return NS_OK;
}
NS_IMETHODIMP
nsDocShell::GetTopWindow(nsIDOMWindow** aWindow)
{
nsresult rv;
nsCOMPtr<nsIDOMWindow> win = do_GetInterface(GetAsSupports(this), &rv);
NS_ENSURE_SUCCESS(rv, rv);
return win->GetTop(aWindow);
nsCOMPtr<nsIDOMWindow> win = do_GetInterface(GetAsSupports(this));
if (win) {
win->GetTop(aWindow);
}
return NS_OK;
}
NS_IMETHODIMP