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 : 8fd652c9d651727a140bece71e1b63269bae9b40
This commit is contained in:
Justin Lebar 2012-07-06 13:35:38 -04:00
Родитель 13d799f93d
Коммит 3ec9bebbae
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -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?