Bug 1410749 - Start tab ID numbering from #1. r=geckoview-reviewers,e…

…sawin It's easier this way than fixing who knows how many Webextension APIs that have learned from Desktop that there is no tab #0 and that therefore refuse to work in our first tab. We'll also make a similar change to GeckoView's stub implementation of the tab API because that affects Custom Tabs and PWAs in Fennec for now. The tests for tab ID 0 are therefore no longer required - they were added in a previous attempt to fix the Webextension APIs themselves, which was ultimately never carried through to completion, though. Differential Revision: https://phabricator.services.mozilla.com/D26431 UltraBlame original commit: 5519079b4dc05033c01baec3e80ff673c3a44f11
marco-c · Oct 4, 2019 · 142afe0 · 142afe0
1 parent 29fa396
commit 142afe0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 58 deletions.
diff --git a/mobile/android/base/java/org/mozilla/gecko/Tabs.java b/mobile/android/base/java/org/mozilla/gecko/Tabs.java
@@ -95,7 +95,9 @@ public class Tabs implements BundleEventListener {
 
     public static final int NEW_LAST_INDEX = -1;
 
-    private static final AtomicInteger sTabId = new AtomicInteger(0);
+
+
+    private static final AtomicInteger sTabId = new AtomicInteger(1);
     private volatile boolean mInitialTabsAdded;
 
     private Context mAppContext;

diff --git a/...ndroid/components/extensions/test/mochitest/test_ext_browserAction_getTitle_setTitle.html b/...ndroid/components/extensions/test/mochitest/test_ext_browserAction_getTitle_setTitle.html
@@ -49,18 +49,6 @@
       return tab;
     }
 
-    // Test on tabId 0
-    // Test that the default title is returned before the title is set for the tab.
-    let tabTitle = await browser.browserAction.getTitle({tabId: 0});
-    browser.test.assertEq("Browser Action", tabTitle,
-                          "Expected the default title to be returned for tabId 0");
-
-    // Set the title for the new tab and test that getTitle returns the correct title.
-    await browser.browserAction.setTitle({tabId: 0, title: "tab 0"});
-    tabTitle = await browser.browserAction.getTitle({tabId: 0});
-    browser.test.assertEq("tab 0", tabTitle,
-                          "Expected the new tab title to be returned for tabId 0");
-
     // Create and test 3 new tabs.
     let tab1 = await createAndTestNewTab("tab 1", "about:blank");
     let tab2 = await createAndTestNewTab("tab 2", "about:blank");

diff --git a/mobile/android/components/extensions/test/mochitest/test_ext_tabs_sendMessage.html b/mobile/android/components/extensions/test/mochitest/test_ext_tabs_sendMessage.html
@@ -237,50 +237,6 @@
   await extension.unload();
 });
 
-
-add_task(async function tabsSendAndReceiveMessageTabId0() {
-  let extension = ExtensionTestUtils.loadExtension({
-    manifest: {
-      "permissions": ["tabs", "<all_urls>"],
-    },
-
-    async background() {
-      function contentScriptCode() {
-        browser.runtime.onMessage.addListener(msg => {
-          browser.test.assertEq(msg, "message to tabId 0",
-                                "Got the expected message from the background page");
-
-          return Promise.resolve("reply to background page");
-        });
-        browser.runtime.sendMessage("message from tabId 0");
-      }
-
-      await browser.runtime.onMessage.addListener(async (msg, sender) => {
-        browser.test.assertEq("message from tabId 0", msg,
-                              "Got the expected message from a content script");
-        browser.test.assertTrue(sender.tab,
-                                "Got a sender.tab object as expected");
-        browser.test.assertEq(0, sender.tab.id,
-                              "Got a sender.tab object with tab.id == 0");
-
-        const reply = await browser.tabs.sendMessage(0, "message to tabId 0");
-
-        browser.test.assertEq("reply to background page", reply);
-
-        browser.test.notifyPass("tabs.messaging.tab0");
-      });
-
-      await browser.tabs.executeScript(0, {code: `new ${contentScriptCode}`});
-    },
-  });
-
-  await extension.startup();
-
-  await extension.awaitFinish("tabs.messaging.tab0");
-
-  await extension.unload();
-});
-
 </script>
 
 </body>

diff --git a/mobile/android/modules/geckoview/GeckoViewTab.jsm b/mobile/android/modules/geckoview/GeckoViewTab.jsm
@@ -23,7 +23,10 @@ class Tab {
 
 class GeckoViewTab extends GeckoViewModule {
   onInit() {
-    const tab = new Tab(0, this.browser);
+
+
+
+    const tab = new Tab(10001, this.browser);
 
     this.window.gBrowser = this.window.BrowserApp = {
       selectedBrowser: this.browser,