Merge autoland to mozilla-central. a=merge

sylvestre · Oct 18, 2021 · 36aa22c · 36aa22c
2 parents 49f2f21 + 591d2d3
commit 36aa22c
Show file tree

Hide file tree

Showing 177 changed files with 3,795 additions and 3,588 deletions.
diff --git a/.clang-format-ignore b/.clang-format-ignore
@@ -4,7 +4,7 @@ build/clang-plugin/.*
 config/gcc-stl-wrapper.template.h
 config/msvc-stl-wrapper.template.h
 # Generated code
-js/src/builtin/intl/LanguageTagGenerated.cpp
+intl/components/src/LocaleGenerated.cpp
 js/src/builtin/intl/TimeZoneDataGenerated.h
 
 # Don't want to reformat irregexp (third-party code)

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -355,7 +355,6 @@ module.exports = {
         "no-nested-ternary": "off",
         "no-new-object": "off",
         "no-new-wrappers": "off",
-        "no-octal": "off",
         "no-redeclare": "off",
         "no-return-await": "off",
         "no-restricted-globals": "off",
@@ -474,7 +473,6 @@ module.exports = {
         "no-empty": "off",
         "no-eval": "off",
         "no-lone-blocks": "off",
-        "no-octal": "off",
         "no-redeclare": "off",
         "no-shadow": "off",
         "no-throw-literal": "off",

diff --git a/.gitignore b/.gitignore
@@ -163,7 +163,8 @@ tps_result.json
 # Ignore files created when running a reftest.
 lextab.py
 
-# Ignore Visual Studio Code workspace files.
+# Ignore Visual Studio/Visual Studio Code workspace files.
+.vs/
 .vscode/
 !.vscode/extensions.json
 !.vscode/tasks.json

diff --git a/.hgignore b/.hgignore
@@ -191,7 +191,8 @@ _OPT\.OBJ/
 tps\.log
 tps_result\.json
 
-# Ignore Visual Studio Code workspace files.
+# Ignore Visual Studio/Visual Studio Code workspace files.
+\.vs/
 \.vscode/(?!extensions\.json|tasks\.json)
 
 # https://bz.mercurial-scm.org/show_bug.cgi?id=5322

diff --git a/browser/components/extensions/test/browser/browser_ext_incognito_popup.js b/browser/components/extensions/test/browser/browser_ext_incognito_popup.js
@@ -23,7 +23,7 @@ add_task(async function testIncognitoPopup() {
         }
       });
 
-      let awaitPopup = windowId => {
+      const awaitPopup = windowId => {
         return new Promise(resolve => {
           resolveMessage = resolve;
         }).then(msg => {
@@ -36,8 +36,8 @@ add_task(async function testIncognitoPopup() {
         });
       };
 
-      let testWindow = async window => {
-        let [tab] = await browser.tabs.query({
+      const testWindow = async window => {
+        const [tab] = await browser.tabs.query({
           active: true,
           windowId: window.id,
         });
@@ -62,44 +62,53 @@ add_task(async function testIncognitoPopup() {
         );
       };
 
-      const URL = "https://example.com/incognito";
-      let windowReady = new Promise(resolve => {
-        browser.tabs.onUpdated.addListener(function listener(
-          tabId,
-          changed,
-          tab
-        ) {
-          if (changed.status == "complete" && tab.url == URL) {
-            browser.tabs.onUpdated.removeListener(listener);
-            resolve();
-          }
-        });
-      });
-
-      try {
-        {
-          let window = await browser.windows.getCurrent();
-
-          await testWindow(window);
-        }
+      const testNonPrivateWindow = async () => {
+        const window = await browser.windows.getCurrent();
+        await testWindow(window);
+      };
 
-        {
-          let window = await browser.windows.create({
-            incognito: true,
-            url: URL,
+      const testPrivateWindow = async () => {
+        const URL = "https://example.com/incognito";
+        const windowReady = new Promise(resolve => {
+          browser.tabs.onUpdated.addListener(function listener(
+            tabId,
+            changed,
+            tab
+          ) {
+            if (changed.status == "complete" && tab.url == URL) {
+              browser.tabs.onUpdated.removeListener(listener);
+              resolve();
+            }
           });
-          await windowReady;
+        });
 
-          await testWindow(window);
+        const window = await browser.windows.create({
+          incognito: true,
+          url: URL,
+        });
+        await windowReady;
 
-          await browser.windows.remove(window.id);
+        await testWindow(window);
+      };
+
+      browser.test.onMessage.addListener(async msg => {
+        switch (msg) {
+          case "test-nonprivate-window":
+            await testNonPrivateWindow();
+            break;
+          case "test-private-window":
+            await testPrivateWindow();
+            break;
+          default:
+            browser.test.fail(
+              `Unexpected test message: ${JSON.stringify(msg)}`
+            );
         }
 
-        browser.test.notifyPass("incognito");
-      } catch (error) {
-        browser.test.fail(`Error: ${error} :: ${error.stack}`);
-        browser.test.notifyFail("incognito");
-      }
+        browser.test.sendMessage(`${msg}:done`);
+      });
+
+      browser.test.sendMessage("bgscript:ready");
     },
 
     files: {
@@ -118,22 +127,43 @@ add_task(async function testIncognitoPopup() {
     },
   });
 
-  extension.onMessage("click-browserAction", () => {
-    clickBrowserAction(
-      extension,
-      Services.wm.getMostRecentWindow("navigator:browser")
-    );
-  });
-
-  extension.onMessage("click-pageAction", () => {
-    clickPageAction(
-      extension,
-      Services.wm.getMostRecentWindow("navigator:browser")
-    );
-  });
-
   await extension.startup();
-  await extension.awaitFinish("incognito");
+  await extension.awaitMessage("bgscript:ready");
+
+  info("Run test on non private window");
+  extension.sendMessage("test-nonprivate-window");
+  await extension.awaitMessage("click-pageAction");
+  const win = Services.wm.getMostRecentWindow("navigator:browser");
+  ok(!PrivateBrowsingUtils.isWindowPrivate(win), "Got a nonprivate window");
+  await clickPageAction(extension, win);
+
+  await extension.awaitMessage("click-browserAction");
+  await clickBrowserAction(extension, win);
+
+  await extension.awaitMessage("test-nonprivate-window:done");
+  await closeBrowserAction(extension, win);
+  await closePageAction(extension, win);
+
+  info("Run test on private window");
+  extension.sendMessage("test-private-window");
+  await extension.awaitMessage("click-pageAction");
+  const privateWin = Services.wm.getMostRecentWindow("navigator:browser");
+  ok(PrivateBrowsingUtils.isWindowPrivate(privateWin), "Got a private window");
+  await clickPageAction(extension, privateWin);
+
+  await extension.awaitMessage("click-browserAction");
+  await clickBrowserAction(extension, privateWin);
+
+  await extension.awaitMessage("test-private-window:done");
+  // Wait for the private window chrome document to be flushed before
+  // closing the browserACtion, pageAction and the entire private window,
+  // to prevent intermittent failures.
+  await privateWin.promiseDocumentFlushed(() => {});
+
+  await closeBrowserAction(extension, privateWin);
+  await closePageAction(extension, privateWin);
+  await BrowserTestUtils.closeWindow(privateWin);
+
   await extension.unload();
 });
 

diff --git a/browser/components/extensions/test/browser/browser_ext_sidebarAction_click.js b/browser/components/extensions/test/browser/browser_ext_sidebarAction_click.js
@@ -55,6 +55,14 @@ add_task(async function test_sidebar_click_isAppTab_behavior() {
 
   // This test fails if docShell.isAppTab has not been set to true.
   let content = SidebarUI.browser.contentWindow;
+
+  // Wait for the layout to be flushed, otherwise this test may
+  // fail intermittently if synthesizeMouseAtCenter is being called
+  // while the sidebar is still opening and the browser window layout
+  // being recomputed.
+  await content.promiseDocumentFlushed(() => {});
+
+  info("Clicking link in extension sidebar");
   await BrowserTestUtils.synthesizeMouseAtCenter(
     "#testlink",
     {},

diff --git a/browser/components/extensions/test/browser/head.js b/browser/components/extensions/test/browser/head.js
@@ -419,6 +419,14 @@ async function openContextMenuInSidebar(selector = "body") {
     contentAreaContextMenu,
     "popupshown"
   );
+
+  // Wait for the layout to be flushed, otherwise this test may
+  // fail intermittently if synthesizeMouseAtCenter is being called
+  // while the sidebar is still opening and the browser window layout
+  // being recomputed.
+  await SidebarUI.browser.contentWindow.promiseDocumentFlushed(() => {});
+
+  info("Opening context menu in sidebarAction panel");
   await BrowserTestUtils.synthesizeMouseAtCenter(
     selector,
     { type: "mousedown", button: 2 },

diff --git a/browser/components/urlbar/UrlbarMuxerUnifiedComplete.jsm b/browser/components/urlbar/UrlbarMuxerUnifiedComplete.jsm
@@ -482,7 +482,7 @@ class MuxerUnifiedComplete extends UrlbarMuxer {
         while (summedFillableLimit != fillableLimit) {
           if (!fractionalDataArray.length) {
             // This shouldn't happen, but don't let it break us.
-            Cu.reportError("fractionalDataArray is empty!");
+            logger.error("fractionalDataArray is empty!");
             break;
           }
           let data = flexDataArray[fractionalDataArray.shift().index];

diff --git a/browser/components/urlbar/UrlbarProviderExtension.jsm b/browser/components/urlbar/UrlbarProviderExtension.jsm
@@ -203,9 +203,10 @@ class UrlbarProviderExtension extends UrlbarProvider {
     let extResults = await this._notifyListener("resultsRequested", context);
     if (extResults) {
       for (let extResult of extResults) {
-        let result = await this._makeUrlbarResult(context, extResult).catch(
-          Cu.reportError
-        );
+        let result = await this._makeUrlbarResult(
+          context,
+          extResult
+        ).catch(ex => this.logger.error(ex));
         if (result) {
           addCallback(this, result);
         }
@@ -282,7 +283,7 @@ class UrlbarProviderExtension extends UrlbarProvider {
     try {
       result = listener(...args);
     } catch (error) {
-      Cu.reportError(error);
+      this.logger.error(error);
       return undefined;
     }
     if (result.catch) {
@@ -296,7 +297,7 @@ class UrlbarProviderExtension extends UrlbarProvider {
       });
       result = await Promise.race([
         timer.promise,
-        result.catch(Cu.reportError),
+        result.catch(ex => this.logger.error(ex)),
       ]);
       timer.cancel();
     }

diff --git a/browser/components/urlbar/UrlbarProviderOmnibox.jsm b/browser/components/urlbar/UrlbarProviderOmnibox.jsm
@@ -169,8 +169,8 @@ class ProviderOmnibox extends UrlbarProvider {
       time: MAXIMUM_ALLOWED_EXTENSION_TIME_MS,
       logger: this.logger,
     }).promise;
-    await Promise.race([timeoutPromise, this._resultsPromise]).catch(
-      Cu.reportError
+    await Promise.race([timeoutPromise, this._resultsPromise]).catch(ex =>
+      this.logger.error(ex)
     );
   }
 }

diff --git a/browser/components/urlbar/UrlbarProviderPlaces.jsm b/browser/components/urlbar/UrlbarProviderPlaces.jsm
@@ -1408,7 +1408,7 @@ class ProviderPlaces extends UrlbarProvider {
         return conn;
       })().catch(ex => {
         dump("Couldn't get database handle: " + ex + "\n");
-        Cu.reportError(ex);
+        this.logger.error(ex);
       });
     }
     return this._promiseDatabase;
@@ -1529,7 +1529,7 @@ class ProviderPlaces extends UrlbarProvider {
       .then(conn => search.execute(conn))
       .catch(ex => {
         dump(`Query failed: ${ex}\n`);
-        Cu.reportError(ex);
+        this.logger.error(ex);
       })
       .then(() => {
         if (search == this._currentSearch) {

diff --git a/browser/components/urlbar/UrlbarProviderPreloadedSites.jsm b/browser/components/urlbar/UrlbarProviderPreloadedSites.jsm
@@ -78,7 +78,7 @@ class ProviderPreloadedSites extends UrlbarProvider {
       fetch("chrome://browser/content/urlbar/preloaded-top-urls.json")
         .then(response => response.json())
         .then(sites => PreloadedSiteStorage.populate(sites))
-        .catch(ex => Cu.reportError(ex));
+        .catch(ex => this.logger.error(ex));
     }
   }
 

diff --git a/browser/components/urlbar/UrlbarProviderQuickSuggest.jsm b/browser/components/urlbar/UrlbarProviderQuickSuggest.jsm
@@ -227,7 +227,7 @@ class ProviderQuickSuggest extends UrlbarProvider {
         r => r.providerName == this.name
       );
       if (resultIndex < 0) {
-        Cu.reportError(`Could not find quick suggest result`);
+        this.logger.error(`Could not find quick suggest result`);
         return;
       }
       result = queryContext.results[resultIndex];
@@ -346,7 +346,7 @@ class ProviderQuickSuggest extends UrlbarProvider {
     try {
       this._merinoFetchController?.abort();
     } catch (error) {
-      Cu.reportError(error);
+      this.logger.error(error);
     }
     this._merinoFetchController = null;
   }
@@ -382,7 +382,7 @@ class ProviderQuickSuggest extends UrlbarProvider {
     } catch (error) {
       TelemetryStopwatch.cancel(TELEMETRY_MERINO_LATENCY, queryContext);
       if (error.name != "AbortError") {
-        Cu.reportError(error);
+        this.logger.error(error);
       }
     } finally {
       if (controller == this._merinoFetchController) {
@@ -402,7 +402,7 @@ class ProviderQuickSuggest extends UrlbarProvider {
         return null;
       }
     } catch (error) {
-      Cu.reportError(error);
+      this.logger.error(error);
     }
 
     if (!body?.suggestions?.length) {
@@ -411,7 +411,7 @@ class ProviderQuickSuggest extends UrlbarProvider {
 
     let { suggestions } = body;
     if (!Array.isArray(suggestions)) {
-      Cu.reportError("Unexpected Merino response: " + JSON.stringify(body));
+      this.logger.error("Unexpected Merino response: " + JSON.stringify(body));
       return null;
     }
 

diff --git a/browser/components/urlbar/UrlbarProviderSearchSuggestions.jsm b/browser/components/urlbar/UrlbarProviderSearchSuggestions.jsm
@@ -378,7 +378,7 @@ class ProviderSearchSuggestions extends UrlbarProvider {
       }
 
       if (entry.tail && entry.tailOffsetIndex < 0) {
-        Cu.reportError(
+        this.logger.error(
           `Error in tail suggestion parsing. Value: ${entry.value}, tail: ${entry.tail}.`
         );
         continue;
@@ -393,7 +393,7 @@ class ProviderSearchSuggestions extends UrlbarProvider {
       }
 
       if (!tail) {
-        await tailTimer.fire().catch(Cu.reportError);
+        await tailTimer.fire().catch(ex => this.logger.error(ex));
       }
 
       try {
@@ -415,7 +415,7 @@ class ProviderSearchSuggestions extends UrlbarProvider {
           )
         );
       } catch (err) {
-        Cu.reportError(err);
+        this.logger.error(err);
         continue;
       }
     }

diff --git a/browser/components/urlbar/UrlbarProviderSearchTips.jsm b/browser/components/urlbar/UrlbarProviderSearchTips.jsm
@@ -323,7 +323,7 @@ class ProviderSearchTips extends UrlbarProvider {
       return;
     }
 
-    this._maybeShowTipForUrl(uri.spec).catch(Cu.reportError);
+    this._maybeShowTipForUrl(uri.spec).catch(ex => this.logger.error(ex));
   }
 
   /**