Bug 1878629 - part 1: Use EventTarget.addEventListener to add system group event listeners instead of nsIEventListenerService (browser/) r=tabbrowser-reviewers,Gijs,dao

Differential Revision: https://phabricator.services.mozilla.com/D201043

Author: gregorypappas

browser/base/content/browser-ctrlTab.js

@@ -581,7 +581,7 @@ var ctrlTab = {
       return;
     }
 
-    Services.els.addSystemEventListener(document, "keyup", this, false);
+    document.addEventListener("keyup", this, { mozSystemGroup: true });
 
     let tabs = gBrowser.visibleTabs;
     if (tabs.length > 2) {
@@ -706,12 +706,7 @@ var ctrlTab = {
         event.stopPropagation();
 
         if (event.keyCode === event.DOM_VK_CONTROL) {
-          Services.els.removeSystemEventListener(
-            document,
-            "keyup",
-            this,
-            false
-          );
+          document.removeEventListener("keyup", this, { mozSystemGroup: true });
 
           if (this.isOpen) {
             this.pick();
@@ -787,9 +782,9 @@ var ctrlTab = {
     tabContainer[toggleEventListener]("TabShow", this);
 
     if (enable) {
-      Services.els.addSystemEventListener(document, "keydown", this, false);
+      document.addEventListener("keydown", this, { mozSystemGroup: true });
     } else {
-      Services.els.removeSystemEventListener(document, "keydown", this, false);
+      document.removeEventListener("keydown", this, { mozSystemGroup: true });
     }
     document[toggleEventListener]("keypress", this);
     gBrowser.tabbox.handleCtrlTab = !enable;

browser/base/content/browser.js

@@ -1694,12 +1694,10 @@ var gBrowserInit = {
 
     if (!gMultiProcessBrowser) {
       // There is a Content:Click message manually sent from content.
-      Services.els.addSystemEventListener(
-        gBrowser.tabpanels,
-        "click",
-        contentAreaClick,
-        true
-      );
+      gBrowser.tabpanels.addEventListener("click", contentAreaClick, {
+        capture: true,
+        mozSystemGroup: true,
+      });
     }
 
     // hook up UI through progress listener

browser/base/content/tabbrowser.js

@@ -119,8 +119,8 @@
 
       Services.obs.addObserver(this, "contextual-identity-updated");
 
-      Services.els.addSystemEventListener(document, "keydown", this, false);
-      Services.els.addSystemEventListener(document, "keypress", this, false);
+      document.addEventListener("keydown", this, { mozSystemGroup: true });
+      document.addEventListener("keypress", this, { mozSystemGroup: true });
       document.addEventListener("visibilitychange", this);
       window.addEventListener("framefocusrequested", this);
       window.addEventListener("activate", this);
@@ -5948,14 +5948,11 @@
         }
       }
 
-      Services.els.removeSystemEventListener(document, "keydown", this, false);
+      document.removeEventListener("keydown", this, { mozSystemGroup: true });
       if (AppConstants.platform == "macosx") {
-        Services.els.removeSystemEventListener(
-          document,
-          "keypress",
-          this,
-          false
-        );
+        document.removeEventListener("keypress", this, {
+          mozSystemGroup: true,
+        });
       }
       document.removeEventListener("visibilitychange", this);
       window.removeEventListener("framefocusrequested", this);

browser/components/customizableui/CustomizableUI.sys.mjs

@@ -1251,8 +1251,8 @@ var CustomizableUIInternal = {
   },
 
   addPanelCloseListeners(aPanel) {
-    Services.els.addSystemEventListener(aPanel, "click", this, false);
-    Services.els.addSystemEventListener(aPanel, "keypress", this, false);
+    aPanel.addEventListener("click", this, { mozSystemGroup: true });
+    aPanel.addEventListener("keypress", this, { mozSystemGroup: true });
     let win = aPanel.ownerGlobal;
     if (!gPanelsForWindow.has(win)) {
       gPanelsForWindow.set(win, new Set());
@@ -1261,8 +1261,8 @@ var CustomizableUIInternal = {
   },
 
   removePanelCloseListeners(aPanel) {
-    Services.els.removeSystemEventListener(aPanel, "click", this, false);
-    Services.els.removeSystemEventListener(aPanel, "keypress", this, false);
+    aPanel.removeEventListener("click", this, { mozSystemGroup: true });
+    aPanel.removeEventListener("keypress", this, { mozSystemGroup: true });
     let win = aPanel.ownerGlobal;
     let panels = gPanelsForWindow.get(win);
     if (panels) {
@@ -5483,7 +5483,10 @@ class OverflowableToolbar {
       let mainViewId = multiview.getAttribute("mainViewId");
       let mainView = doc.getElementById(mainViewId);
       let contextMenu = doc.getElementById(mainView.getAttribute("context"));
-      Services.els.addSystemEventListener(contextMenu, "command", this, true);
+      contextMenu.addEventListener("command", this, {
+        capture: true,
+        mozSystemGroup: true,
+      });
       let anchor = this.#defaultListButton.icon;
 
       let popupshown = false;
@@ -6082,12 +6085,10 @@ class OverflowableToolbar {
     let contextMenuId = this.#defaultListPanel.getAttribute("context");
     if (contextMenuId) {
       let contextMenu = doc.getElementById(contextMenuId);
-      Services.els.removeSystemEventListener(
-        contextMenu,
-        "command",
-        this,
-        true
-      );
+      contextMenu.removeEventListener("command", this, {
+        capture: true,
+        mozSystemGroup: true,
+      });
     }
   }
 

browser/components/downloads/content/downloads.js

@@ -528,7 +528,10 @@ var DownloadsPanel = {
   },
 
   _startWatchingForSpammyDownloadActivation() {
-    Services.els.addSystemEventListener(window, "keydown", this, true);
+    window.addEventListener("keydown", this, {
+      capture: true,
+      mozSystemGroup: true,
+    });
   },
 
   _lastBeepTime: 0,
@@ -546,7 +549,10 @@ var DownloadsPanel = {
   },
 
   _stopWatchingForSpammyDownloadActivation() {
-    Services.els.removeSystemEventListener(window, "keydown", this, true);
+    window.removeEventListener("keydown", this, {
+      capture: true,
+      mozSystemGroup: true,
+    });
   },
 
   /**

browser/components/resistfingerprinting/test/mochitest/test_keyboard_event.html

@@ -24,31 +24,26 @@
 
   // This test makes sure that system event group will still get real keyboard event.
   function doTestForSystemEventGroup() {
-    SpecialPowers.addSystemEventListener(document, "keydown",
+    SpecialPowers.wrap(document).addEventListener("keydown",
       function eventHandler(aEvent) {
-        SpecialPowers.removeSystemEventListener(document,
-          "keydown", eventHandler, true);
-
         is(aEvent.code, "Minus", "The system group event should get real code.");
         is(aEvent.keyCode, 63, "The system group event should get real keyCode.");
 
         doTestModifiersForSystemEventGroup();
-      }, true);
+      }, { once: true, capture: true, mozSystemGroup: true });
 
     // Send key event to the system group.
     synthesizeKey("\u00DF", {code: "Minus", keyCode: 63});
   }
 
   // Test that will system group event still get suppressed modifier keys
   function doTestModifiersForSystemEventGroup() {
-    SpecialPowers.addSystemEventListener(document, "keydown",
+    SpecialPowers.wrap(document).addEventListener("keydown",
       function eventHandler(aEvent) {
-        SpecialPowers.removeSystemEventListener(document,
-          "keydown", eventHandler, true);
         is(aEvent.key, "Alt", "The system group event get the suppressed keyboard event.");
 
         SimpleTest.finish();
-      }, true);
+      }, { once: true, capture: true, mozSystemGroup: true });
 
     // Send key event to the system group.
     synthesizeKey("KEY_Alt", {altKey: true});

browser/components/syncedtabs/TabListView.sys.mjs

@@ -411,12 +411,9 @@ TabListView.prototype = {
 
   // Set up the custom context menu
   _setupContextMenu() {
-    Services.els.addSystemEventListener(
-      this._window,
-      "contextmenu",
-      this,
-      false
-    );
+    this._window.addEventListener("contextmenu", this, {
+      mozSystemGroup: true,
+    });
     for (let getMenu of [getContextMenu, getTabsFilterContextMenu]) {
       let menu = getMenu(this._window);
       menu.addEventListener("popupshowing", this, true);
@@ -426,12 +423,9 @@ TabListView.prototype = {
 
   _teardownContextMenu() {
     // Tear down context menu
-    Services.els.removeSystemEventListener(
-      this._window,
-      "contextmenu",
-      this,
-      false
-    );
+    this._window.removeEventListener("contextmenu", this, {
+      mozSystemGroup: true,
+    });
     for (let getMenu of [getContextMenu, getTabsFilterContextMenu]) {
       let menu = getMenu(this._window);
       menu.removeEventListener("popupshowing", this, true);