Backed out changeset 7b1f88583896 (bug 1342207) for frequently failing browser_ext_tabs_onHighlighted.js. r=backout

browser/components/extensions/ext-tabs.js

@@ -103,15 +103,11 @@ this.tabs = class extends ExtensionAPI {
 
     let self = {
       tabs: {
-        onActivated: new SingletonEventManager(context, "tabs.onActivated", fire => {
-          let listener = (eventName, event) => {
-            fire.async(event);
-          };
-
-          tabTracker.on("tab-activated", listener);
-          return () => {
-            tabTracker.off("tab-activated", listener);
-          };
+        onActivated: new WindowEventManager(context, "tabs.onActivated", "TabSelect", (fire, event) => {
+          let nativeTab = event.originalTarget;
+          let tabId = tabTracker.getId(nativeTab);
+          let windowId = windowTracker.getId(nativeTab.ownerGlobal);
+          fire.async({tabId, windowId});
         }).api(),
 
         onCreated: new SingletonEventManager(context, "tabs.onCreated", fire => {
@@ -131,15 +127,11 @@ this.tabs = class extends ExtensionAPI {
          * the tabId in an array to match the API.
          * @see  https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/Tabs/onHighlighted
         */
-        onHighlighted: new SingletonEventManager(context, "tabs.onHighlighted", fire => {
-          let listener = (eventName, event) => {
-            fire.async({tabIds: [event.tabId], windowId: event.windowId});
-          };
-
-          tabTracker.on("tab-activated", listener);
-          return () => {
-            tabTracker.off("tab-activated", listener);
-          };
+        onHighlighted: new WindowEventManager(context, "tabs.onHighlighted", "TabSelect", (fire, event) => {
+          let nativeTab = event.originalTarget;
+          let tabIds = [tabTracker.getId(nativeTab)];
+          let windowId = windowTracker.getId(nativeTab.ownerGlobal);
+          fire.async({tabIds, windowId});
         }).api(),
 
         onAttached: new SingletonEventManager(context, "tabs.onAttached", fire => {

browser/components/extensions/ext-utils.js

@@ -156,7 +156,6 @@ class TabTracker extends TabTrackerBase {
 
     windowTracker.addListener("TabClose", this);
     windowTracker.addListener("TabOpen", this);
-    windowTracker.addListener("TabSelect", this);
     windowTracker.addOpenListener(this._handleWindowOpen);
     windowTracker.addCloseListener(this._handleWindowClose);
 
@@ -264,14 +263,6 @@ class TabTracker extends TabTrackerBase {
           this.emitRemoved(nativeTab, false);
         }
         break;
-
-      case "TabSelect":
-        // Because we are delaying calling emitCreated above, we also need to
-        // delay sending this event because it shouldn't fire before onCreated.
-        Promise.resolve().then(() => {
-          this.emitActivated(nativeTab);
-        });
-        break;
     }
   }
 
@@ -317,9 +308,6 @@ class TabTracker extends TabTrackerBase {
       for (let nativeTab of window.gBrowser.tabs) {
         this.emitCreated(nativeTab);
       }
-
-      // emitActivated to trigger tab.onActivated/tab.onHighlighted for a newly opened window.
-      this.emitActivated(window.gBrowser.tabs[0]);
     }
   }
 
@@ -341,19 +329,6 @@ class TabTracker extends TabTrackerBase {
     }
   }
 
-  /**
-   * Emits a "tab-activated" event for the given tab element.
-   *
-   * @param {NativeTab} nativeTab
-   *        The tab element which has been activated.
-   * @private
-   */
-  emitActivated(nativeTab) {
-    this.emit("tab-activated", {
-      tabId: this.getId(nativeTab),
-      windowId: windowTracker.getId(nativeTab.ownerGlobal)});
-  }
-
   /**
    * Emits a "tab-attached" event for the given tab element.
    *

browser/components/extensions/test/browser/browser_ext_tabs_onHighlighted.js

@@ -25,14 +25,6 @@ add_task(function* testTabEvents() {
       }
     });
 
-    browser.tabs.onCreated.addListener((info) => {
-      if (info.id in events) {
-        events[info.id].push("onCreated");
-      } else {
-        events[info.id] = ["onCreated"];
-      }
-    });
-
     browser.tabs.onHighlighted.addListener((info) => {
       if (info.tabIds[0] in events) {
         events[info.tabIds[0]].push("onHighlighted");
@@ -51,10 +43,7 @@ add_task(function* testTabEvents() {
     async function expectEvents(tabId, expectedEvents) {
       browser.test.log(`Expecting events: ${expectedEvents.join(", ")}`);
 
-      // Wait up to 5 ticks for the expected number of events.
-      for (let i = 0; i < 5 && (!events[tabId] || events[tabId].length < expectedEvents.length); i++) {
-        await new Promise(resolve => setTimeout(resolve, 0));
-      }
+      await new Promise(resolve => setTimeout(resolve, 0));
 
       browser.test.assertEq(expectedEvents.length, events[tabId].length,
                             `Got expected number of events for ${tabId}`);
@@ -72,58 +61,23 @@ add_task(function* testTabEvents() {
      * @param {number} windowId
      */
     async function openTab(windowId) {
-      browser.test.assertEq(0, Object.keys(events).length,
-                           "No events remaining before testing openTab.");
-
       let tab = await browser.tabs.create({windowId});
 
       tabIds.push(tab.id);
       browser.test.log(`Opened tab ${tab.id}`);
 
       await expectEvents(tab.id, [
-        "onCreated",
         "onActivated",
         "onHighlighted",
       ]);
     }
 
-    /**
-     * Opens a new window and asserts that the correct events are fired.
-     *
-     * @param {Array} urls A list of urls for which to open tabs in the new window.
-     */
-    async function openWindow(urls) {
-      browser.test.assertEq(0, Object.keys(events).length,
-                           "No events remaining before testing openWindow.");
-
-      let window = await browser.windows.create({url: urls});
-      browser.test.log(`Opened new window ${window.id}`);
-
-      for (let [i] of urls.entries()) {
-        let tab = window.tabs[i];
-        tabIds.push(tab.id);
-
-        let expectedEvents = [
-            "onCreated",
-            "onActivated",
-            "onHighlighted",
-        ];
-        if (i !== 0) {
-          expectedEvents.splice(1);
-        }
-        await expectEvents(window.tabs[i].id, expectedEvents);
-      }
-    }
-
     /**
      * Highlights an existing tab and asserts that the correct events are fired.
      *
      * @param {number} tabId
      */
     async function highlightTab(tabId) {
-      browser.test.assertEq(0, Object.keys(events).length,
-                           "No events remaining before testing highlightTab.");
-
       browser.test.log(`Highlighting tab ${tabId}`);
       let tab = await browser.tabs.update(tabId, {active: true});
 
@@ -153,15 +107,6 @@ add_task(function* testTabEvents() {
       highlightTab(tabIds[2]),
     ]);
 
-    await Promise.all([
-      openWindow(["http://example.com"]),
-      openWindow(["http://example.com", "http://example.org"]),
-      openWindow(["http://example.com", "http://example.org", "http://example.net"]),
-    ]);
-
-    browser.test.assertEq(0, Object.keys(events).length,
-                          "No events remaining after tests.");
-
     await Promise.all(tabIds.map(id => browser.tabs.remove(id)));
 
     browser.test.notifyPass("tabs.highlight");