Bug 764718 - Part 1: Make window.close work on windows opened via window.open from <iframe mozbrowser>, when OOP is disabled. r=bz

--HG--
extra : rebase_source : c5f99247921df912d2369757756998c037a0957a
This commit is contained in:
Justin Lebar 2012-07-09 15:50:05 -04:00
parent 7bf894ced1
commit 07f15b3b1b

View File

@ -851,14 +851,14 @@ nsContentTreeOwner::ProvideWindow(nsIDOMWindow* aParent,
!(aChromeFlags & (nsIWebBrowserChrome::CHROME_MODAL |
nsIWebBrowserChrome::CHROME_OPENAS_DIALOG |
nsIWebBrowserChrome::CHROME_OPENAS_CHROME))) {
bool openSucceeded =
*aWindowIsNew =
BrowserElementParent::OpenWindowInProcess(aParent, aURI, aName,
aFeatures, aReturn);
// If OpenWindowInProcess failed (perhaps because the embedder blocked the
// popup), tell our caller not to proceed trying to create a new window
// through other means.
return openSucceeded ? NS_OK : NS_ERROR_ABORT;
return *aWindowIsNew ? NS_OK : NS_ERROR_ABORT;
}
// Where should we open this?