From b86796df77410af54ff2bc70843df80e67728d62 Mon Sep 17 00:00:00 2001 From: Christian Legnitto Date: Mon, 31 Oct 2011 16:39:32 -0700 Subject: [PATCH] Backout 223d4f4bd252 (bug 463491) due to a regression (bug 679961). a=LegNeato --- content/events/src/nsDOMEvent.cpp | 3 + dom/tests/browser/Makefile.in | 1 - .../browser_popup_blocker_save_open_panel.js | 56 ------------------- 3 files changed, 3 insertions(+), 57 deletions(-) delete mode 100644 dom/tests/browser/browser_popup_blocker_save_open_panel.js diff --git a/content/events/src/nsDOMEvent.cpp b/content/events/src/nsDOMEvent.cpp index 977074e97cf0..66a49656ff3a 100644 --- a/content/events/src/nsDOMEvent.cpp +++ b/content/events/src/nsDOMEvent.cpp @@ -998,6 +998,9 @@ nsDOMEvent::GetEventPopupControlState(nsEvent *aEvent) if (::PopupAllowedForEvent("change")) abuse = openControlled; break; + case NS_XUL_COMMAND: + abuse = openControlled; + break; } } break; diff --git a/dom/tests/browser/Makefile.in b/dom/tests/browser/Makefile.in index e240e1b7998b..3303f2c63002 100644 --- a/dom/tests/browser/Makefile.in +++ b/dom/tests/browser/Makefile.in @@ -53,7 +53,6 @@ _BROWSER_FILES = \ browser_ConsoleStorageAPITests.js \ browser_ConsoleStoragePBTest.js \ browser_autofocus_preference.js \ - browser_popup_blocker_save_open_panel.js \ browser_bug396843.js \ $(NULL) diff --git a/dom/tests/browser/browser_popup_blocker_save_open_panel.js b/dom/tests/browser/browser_popup_blocker_save_open_panel.js deleted file mode 100644 index 88908564324e..000000000000 --- a/dom/tests/browser/browser_popup_blocker_save_open_panel.js +++ /dev/null @@ -1,56 +0,0 @@ -/** - * In this test, we call the save panel with CTRL+S. When shown, we load a - * webpage that is going to open malicious popups. These popups should be - * disallowed. - */ - -var gLoaded = false; - -var MockFilePicker = SpecialPowers.MockFilePicker; -function onShowCallback() { - gBrowser.selectedTab.linkedBrowser.addEventListener("load", function () { - gBrowser.selectedTab.linkedBrowser.removeEventListener("load", arguments.callee, true); - executeSoon(function() { - gLoaded = true; - }); - }, true); - - gBrowser.selectedTab.linkedBrowser.loadURI("data:text/html,"); - - let curThread = Components.classes["@mozilla.org/thread-manager;1"] - .getService().currentThread; - while (!gLoaded) { - curThread.processNextEvent(true); - } - - MockFilePicker.returnValue = MockFilePicker.returnCancel; -}; - -function test() { - waitForExplicitFinish(); - - MockFilePicker.reset(); - MockFilePicker.showCallback = onShowCallback; - - var prefs = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranch); - var gDisableLoadPref = prefs.getBoolPref("dom.disable_open_during_load"); - prefs.setBoolPref("dom.disable_open_during_load", true); - - gBrowser.addEventListener("DOMPopupBlocked", function() { - gBrowser.removeEventListener("DOMPopupBlocked", arguments.callee, true); - ok(true, "The popup has been blocked"); - prefs.setBoolPref("dom.disable_open_during_load", gDisableLoadPref); - - MockFilePicker.reset(); - - finish(); - }, true) - - if (navigator.platform.indexOf("Mac") == 0) { - // MacOS use metaKey instead of ctrlKey. - EventUtils.synthesizeKey("s", { metaKey: true, }); - } else { - EventUtils.synthesizeKey("s", { ctrlKey: true, }); - } -}