Backed out changeset 1f6bcce44b79 (bug 1069966) for webplatform test failures.
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 20 Oct 2014 11:39:00 -0400
changeset 211336 048ea26297b451de81eb5b4b6d97a7c89149f57d
parent 211335 993ce1fb05f9dc9fca1280ecd4e561c8bac6f4d2
child 211337 37a4ada143dccea95f9311d709da6c9af5211f84
push id27673
push userkwierso@gmail.com
push dateTue, 21 Oct 2014 01:57:45 +0000
treeherdermozilla-central@29fbfc1b31aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1069966
milestone36.0a1
backs out1f6bcce44b79b0d86884a9f7b6f04b14d4f79393
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 1f6bcce44b79 (bug 1069966) for webplatform test failures. CLOSED TREE
browser/base/content/content.js
--- a/browser/base/content/content.js
+++ b/browser/base/content/content.js
@@ -81,17 +81,17 @@ addEventListener("DOMFormHasPassword", f
 addEventListener("DOMAutoComplete", function(event) {
   LoginManagerContent.onUsernameInput(event);
 });
 addEventListener("blur", function(event) {
   LoginManagerContent.onUsernameInput(event);
 });
 
 if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT) {
-  let handleContentContextMenu = function (event) {
+  addEventListener("contextmenu", function (event) {
     let defaultPrevented = event.defaultPrevented;
     if (!Services.prefs.getBoolPref("dom.event.contextmenu.enabled")) {
       let plugin = null;
       try {
         plugin = event.target.QueryInterface(Ci.nsIObjectLoadingContent);
       } catch (e) {}
       if (plugin && plugin.displayedType == Ci.nsIObjectLoadingContent.TYPE_PLUGIN) {
         // Don't open a context menu for plugins.
@@ -107,22 +107,17 @@ if (Services.appinfo.processType == Serv
       if (editFlags &
           (SpellCheckHelper.EDITABLE | SpellCheckHelper.CONTENTEDITABLE)) {
         spellInfo =
           InlineSpellCheckerContent.initContextMenu(event, editFlags, this);
       }
 
       sendSyncMessage("contextmenu", { editFlags, spellInfo }, { event });
     }
-  }
-
-  Cc["@mozilla.org/eventlistenerservice;1"]
-    .getService(Ci.nsIEventListenerService)
-    .addSystemEventListener(global, "contextmenu", handleContentContextMenu, true);
-
+  }, false);
 } else {
   addEventListener("mozUITour", function(event) {
     if (!Services.prefs.getBoolPref("browser.uitour.enabled"))
       return;
 
     let handled = UITour.onPageEvent(event);
     if (handled)
       addEventListener("pagehide", UITour);