From d170c462cd35dbf7f7da786612d5fe260a145ac7 Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Fri, 6 Jul 2012 16:27:58 -0700 Subject: [PATCH] Back out 8e47e74e3578 and 82f24178d2cb (bug 764718) because of test failure --- dom/browser-element/mochitest/Makefile.in | 4 --- .../browserElement_CloseFromOpener.js | 34 ------------------- .../file_browserElement_CloseFromOpener.html | 8 ----- ...browserElement_inproc_CloseFromOpener.html | 18 ---------- ...st_browserElement_oop_CloseFromOpener.html | 18 ---------- xpfe/appshell/src/nsContentTreeOwner.cpp | 4 +-- 6 files changed, 2 insertions(+), 84 deletions(-) delete mode 100644 dom/browser-element/mochitest/browserElement_CloseFromOpener.js delete mode 100644 dom/browser-element/mochitest/file_browserElement_CloseFromOpener.html delete mode 100644 dom/browser-element/mochitest/test_browserElement_inproc_CloseFromOpener.html delete mode 100644 dom/browser-element/mochitest/test_browserElement_oop_CloseFromOpener.html diff --git a/dom/browser-element/mochitest/Makefile.in b/dom/browser-element/mochitest/Makefile.in index 8518d8c15826..ab1066cec904 100644 --- a/dom/browser-element/mochitest/Makefile.in +++ b/dom/browser-element/mochitest/Makefile.in @@ -54,9 +54,6 @@ _TEST_FILES = \ test_browserElement_inproc_PromptConfirm.html \ browserElement_Close.js \ test_browserElement_inproc_Close.html \ - browserElement_CloseFromOpener.js \ - test_browserElement_inproc_CloseFromOpener.html \ - file_browserElement_CloseFromOpener.html \ browserElement_OpenWindow.js \ test_browserElement_inproc_OpenWindow.html \ file_browserElement_Open1.html \ @@ -94,7 +91,6 @@ _TEST_FILES += \ test_browserElement_oop_PromptCheck.html \ test_browserElement_oop_PromptConfirm.html \ test_browserElement_oop_Close.html \ - test_browserElement_oop_CloseFromOpener.html \ test_browserElement_oop_OpenWindow.html \ test_browserElement_oop_OpenWindowInFrame.html \ test_browserElement_oop_OpenWindowRejected.html \ diff --git a/dom/browser-element/mochitest/browserElement_CloseFromOpener.js b/dom/browser-element/mochitest/browserElement_CloseFromOpener.js deleted file mode 100644 index 46f26578333b..000000000000 --- a/dom/browser-element/mochitest/browserElement_CloseFromOpener.js +++ /dev/null @@ -1,34 +0,0 @@ -/* Any copyright is dedicated to the public domain. - http://creativecommons.org/publicdomain/zero/1.0/ */ - -// Bug 764718 - Test that window.close() works from the opener window. -"use strict"; - -SimpleTest.waitForExplicitFinish(); - -function runTest() { - browserElementTestHelpers.setEnabledPref(true); - browserElementTestHelpers.addToWhitelist(); - - var iframe = document.createElement('iframe'); - iframe.mozbrowser = true; - - iframe.addEventListener('mozbrowseropenwindow', function(e) { - ok(true, "got openwindow event."); - document.body.appendChild(e.detail.frameElement); - - e.detail.frameElement.addEventListener("mozbrowserclose", function(e) { - ok(true, "got mozbrowserclose event."); - SimpleTest.finish(); - }); - }); - - - document.body.appendChild(iframe); - - // file_browserElement_CloseFromOpener opens a new window and then calls - // close() on it. - iframe.src = "file_browserElement_CloseFromOpener.html"; -} - -runTest(); diff --git a/dom/browser-element/mochitest/file_browserElement_CloseFromOpener.html b/dom/browser-element/mochitest/file_browserElement_CloseFromOpener.html deleted file mode 100644 index 4a08c2792b6c..000000000000 --- a/dom/browser-element/mochitest/file_browserElement_CloseFromOpener.html +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/dom/browser-element/mochitest/test_browserElement_inproc_CloseFromOpener.html b/dom/browser-element/mochitest/test_browserElement_inproc_CloseFromOpener.html deleted file mode 100644 index 3c7ee4d874b4..000000000000 --- a/dom/browser-element/mochitest/test_browserElement_inproc_CloseFromOpener.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - - Test for Bug 757182 - - - - - -Mozilla Bug 757182 - - - - diff --git a/dom/browser-element/mochitest/test_browserElement_oop_CloseFromOpener.html b/dom/browser-element/mochitest/test_browserElement_oop_CloseFromOpener.html deleted file mode 100644 index 3c7ee4d874b4..000000000000 --- a/dom/browser-element/mochitest/test_browserElement_oop_CloseFromOpener.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - - Test for Bug 757182 - - - - - -Mozilla Bug 757182 - - - - diff --git a/xpfe/appshell/src/nsContentTreeOwner.cpp b/xpfe/appshell/src/nsContentTreeOwner.cpp index b61e04693f8e..d1c0e0746604 100644 --- a/xpfe/appshell/src/nsContentTreeOwner.cpp +++ b/xpfe/appshell/src/nsContentTreeOwner.cpp @@ -851,14 +851,14 @@ nsContentTreeOwner::ProvideWindow(nsIDOMWindow* aParent, !(aChromeFlags & (nsIWebBrowserChrome::CHROME_MODAL | nsIWebBrowserChrome::CHROME_OPENAS_DIALOG | nsIWebBrowserChrome::CHROME_OPENAS_CHROME))) { - *aWindowIsNew = + bool openSucceeded = 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 *aWindowIsNew ? NS_OK : NS_ERROR_ABORT; + return openSucceeded ? NS_OK : NS_ERROR_ABORT; } // Where should we open this?