Bug 866748: isTopLevel shouldn't throw, r=smaug

--HG--
extra : transplant_source : %FDZ%DE6%3Bw%A7%CD%C7%A2%5D%60%7F%B7%2C%92F5%88%08
This commit is contained in:
Gavin Sharp 2013-04-29 15:52:57 -07:00
parent 5f04390d3e
commit cfbdcfbaa7

View File

@ -952,17 +952,18 @@ nsDocLoader::GetIsTopLevel(bool *aResult)
*aResult = false;
nsCOMPtr<nsIDOMWindow> window;
nsresult rv = GetDOMWindow(getter_AddRefs(window));
NS_ENSURE_SUCCESS(rv, rv);
GetDOMWindow(getter_AddRefs(window));
if (window) {
nsCOMPtr<nsPIDOMWindow> piwindow = do_QueryInterface(window);
NS_ENSURE_STATE(piwindow);
nsCOMPtr<nsPIDOMWindow> piwindow = do_QueryInterface(window);
NS_ENSURE_STATE(piwindow);
nsCOMPtr<nsIDOMWindow> topWindow;
rv = piwindow->GetTop(getter_AddRefs(topWindow));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIDOMWindow> topWindow;
rv = piwindow->GetTop(getter_AddRefs(topWindow));
NS_ENSURE_SUCCESS(rv, rv);
*aResult = piwindow == topWindow;
}
*aResult = piwindow == topWindow;
return NS_OK;
}