Merge autoland to mozilla-central. a=merge

sylvestre · Jul 13, 2021 · 42ae3be · 42ae3be
2 parents d1e1f21 + 35f02d8
commit 42ae3be
Show file tree

Hide file tree

Showing 452 changed files with 6,026 additions and 3,616 deletions.
diff --git a/.cron.yml b/.cron.yml
@@ -121,6 +121,7 @@ jobs:
           - mozilla-beta
           - mozilla-release
           - mozilla-esr78
+          - mozilla-esr91
       when:
           by-project:
               # We want to run at both of the times the nightly runs.
@@ -140,6 +141,7 @@ jobs:
               mozilla-beta: [{hour: 10, minute: 0}]
               mozilla-release: [{hour: 10, minute: 0}]
               mozilla-esr78: [{hour: 10, minute: 0}]
+              mozilla-esr91: [{hour: 10, minute: 0}]
 
     - name: coverity-tree-analysis
       job:
@@ -208,6 +210,7 @@ jobs:
           - mozilla-beta
           - mozilla-release
           - mozilla-esr78
+          - mozilla-esr91
       when:
           by-project:
               # No default branch
@@ -223,6 +226,9 @@ jobs:
               mozilla-esr78:
                   - {hour: 7, minute: 0}
                   - {hour: 19, minute: 0}
+              mozilla-esr91:
+                  - {hour: 7, minute: 0}
+                  - {hour: 19, minute: 0}
 
     - name: periodic-update
       job:
@@ -234,6 +240,7 @@ jobs:
           - mozilla-beta
           - mozilla-release
           - mozilla-esr78
+          - mozilla-esr91
       when:
           - {weekday: 'Monday', hour: 8, minute: 0}
           - {weekday: 'Thursday', hour: 8, minute: 0}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/accessible/xpcom/xpcAccessibleMacInterface.mm b/accessible/xpcom/xpcAccessibleMacInterface.mm
@@ -16,6 +16,7 @@
 #include "mozilla/dom/ToJSValue.h"
 #include "mozilla/Services.h"
 #include "nsString.h"
+#include "js/PropertyAndElement.h" // JS_Enumerate, JS_GetElement, JS_GetProperty, JS_GetPropertyById, JS_HasOwnProperty, JS_SetUCProperty
 
 #import "mozAccessible.h"
 

diff --git a/browser/base/content/browser-pageActions.js b/browser/base/content/browser-pageActions.js
@@ -533,7 +533,7 @@ var BrowserPageActions = {
 
   _makeUrlbarButtonNode(action) {
     let buttonNode = document.createXULElement("hbox");
-    buttonNode.classList.add("urlbar-icon-wrapper", "urlbar-page-action");
+    buttonNode.classList.add("urlbar-page-action");
     if (action.extensionID) {
       buttonNode.classList.add("urlbar-addon-page-action");
     }

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
@@ -1057,12 +1057,11 @@ toolbarpaletteitem[place="palette"] > #downloads-button[indicator] > .toolbarbut
   display: none;
 }
 
-/* Give this menupopup an arrow panel styling */
-#BMB_bookmarksPopup {
+/* Give these menupopups an arrow panel styling */
+#BMB_bookmarksPopup,
+#PlacesToolbar menupopup {
   background: transparent;
   border: none;
-  /* The popup inherits -moz-image-region from the button, must reset it */
-  -moz-image-region: auto;
 }
 
 #BMB_bookmarksPopup,

diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
@@ -336,7 +336,7 @@
                 </hbox>
                 <hbox id="cfr-button"
                       role="presentation"
-                      class="urlbar-page-action urlbar-icon-wrapper">
+                      class="urlbar-page-action">
                   <image class="urlbar-icon"/>
                 </hbox>
               </hbox>
@@ -345,7 +345,7 @@
                 <image id="userContext-indicator"/>
               </hbox>
               <hbox id="reader-mode-button"
-                    class="urlbar-page-action urlbar-icon-wrapper"
+                    class="urlbar-page-action"
                     role="button"
                     hidden="true"
                     tooltip="dynamic-shortcut-tooltip"
@@ -358,7 +358,7 @@
                      tooltip="dynamic-shortcut-tooltip"
                      hidden="true"/>
               <hbox id="pageActionButton"
-                    class="urlbar-page-action urlbar-icon-wrapper"
+                    class="urlbar-page-action"
                     role="button"
                     data-l10n-id="urlbar-page-action-button"
                     onmousedown="BrowserPageActions.mainButtonClicked(event);"
@@ -368,7 +368,7 @@
               <hbox id="star-button-box"
                     hidden="true"
                     role="button"
-                    class="urlbar-page-action urlbar-icon-wrapper"
+                    class="urlbar-page-action"
                     onclick="BrowserPageActions.doCommandForAction(PageActions.actionForID('bookmark'), event, this);">
                 <image id="star-button"
                        class="urlbar-icon"/>

diff --git a/browser/base/content/test/fullscreen/browser_fullscreen_window_focus.js b/browser/base/content/test/fullscreen/browser_fullscreen_window_focus.js
@@ -3,6 +3,11 @@
 
 "use strict";
 
+async function pause() {
+  /* eslint-disable mozilla/no-arbitrary-setTimeout */
+  return new Promise(resolve => setTimeout(resolve, 500));
+}
+
 // This test tends to trigger a race in the fullscreen time telemetry,
 // where the fullscreen enter and fullscreen exit events (which use the
 // same histogram ID) overlap. That causes TelemetryStopwatch to log an
@@ -18,6 +23,8 @@ async function testWindowFocus(isPopup, iframeID) {
 
   info("Calling window.open()");
   let openedWindow = await jsWindowOpen(tab.linkedBrowser, isPopup, iframeID);
+  info("Letting OOP focus to stabilize");
+  await pause(); // Bug 1719659 for proper fix
   info("re-focusing main window");
   await waitForFocus(tab.linkedBrowser);
 
@@ -43,6 +50,8 @@ async function testWindowElementFocus(isPopup) {
 
   info("Calling window.open()");
   let openedWindow = await jsWindowOpen(tab.linkedBrowser, isPopup);
+  info("Letting OOP focus to stabilize");
+  await pause(); // Bug 1719659 for proper fix
   info("re-focusing main window");
   await waitForFocus(tab.linkedBrowser);
 

diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini
@@ -299,6 +299,7 @@ skip-if = verify
 [browser_tab_detach_restore.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_tab_drag_drop_perwindow.js]
+skip-if = os == "win" && os_version == "6.1" && webrender && bits == 32 # bug 1717587
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_tab_dragdrop.js]
 skip-if = true # Bug 1312436, Bug 1388973

diff --git a/browser/base/content/test/performance/browser_startup_mainthreadio.js b/browser/base/content/test/performance/browser_startup_mainthreadio.js
@@ -486,8 +486,8 @@ const startupPhases = {
       ignoreIfUnused: true,
       stat: 4,
       fsync: 3,
-      read: 40,
-      write: 156,
+      read: 44,
+      write: 164,
     },
     {
       // bug 1391590
@@ -503,7 +503,7 @@ const startupPhases = {
       fsync: 2,
       read: 4,
       stat: 3,
-      write: 1313,
+      write: 1317,
     },
     {
       // bug 1391590

diff --git a/browser/components/extensions/parent/ext-browser.js b/browser/components/extensions/parent/ext-browser.js
@@ -938,16 +938,20 @@ class Tab extends TabBase {
         : tabData.lastAccessed,
     };
 
+    let entries = tabData.state ? tabData.state.entries : tabData.entries;
+    let lastTabIndex = tabData.state ? tabData.state.index : tabData.index;
+    // We need to take lastTabIndex - 1 because the index in the tab data is
+    // 1-based rather than 0-based.
+    let entry = entries[lastTabIndex - 1];
+
     // tabData is a representation of a tab, as stored in the session data,
     // and given that is not a real nativeTab, we only need to check if the extension
-    // has the "tabs" permission (because tabData represents a closed tab, and so we
-    // already know that it can't be the activeTab).
-    if (extension.hasPermission("tabs")) {
-      let entries = tabData.state ? tabData.state.entries : tabData.entries;
-      let lastTabIndex = tabData.state ? tabData.state.index : tabData.index;
-      // We need to take lastTabIndex - 1 because the index in the tab data is
-      // 1-based rather than 0-based.
-      let entry = entries[lastTabIndex - 1];
+    // has the "tabs" or host permission (because tabData represents a closed tab,
+    // and so we already know that it can't be the activeTab).
+    if (
+      extension.hasPermission("tabs") ||
+      extension.allowedOrigins.matches(entry.url)
+    ) {
       result.url = entry.url;
       result.title = entry.title;
       if (tabData.image) {

diff --git a/browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed_tabs.js b/browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed_tabs.js
@@ -137,7 +137,7 @@ add_task(async function test_sessions_get_recently_closed_tabs() {
 
   await extension.unload();
 
-  // Test without tabs permission.
+  // Test without tabs and host permissions.
   extension = ExtensionTestUtils.loadExtension({
     manifest: {
       permissions: ["sessions"],
@@ -162,4 +162,44 @@ add_task(async function test_sessions_get_recently_closed_tabs() {
   }
 
   await extension.unload();
+
+  // Test with host permission.
+  win = await BrowserTestUtils.openNewBrowserWindow();
+  tabBrowser = win.gBrowser.selectedBrowser;
+  BrowserTestUtils.loadURI(tabBrowser, "http://example.com/testpage");
+  await BrowserTestUtils.browserLoaded(
+    tabBrowser,
+    false,
+    "http://example.com/testpage"
+  );
+  tab = win.gBrowser.getTabForBrowser(tabBrowser);
+  try {
+    await BrowserTestUtils.waitForCondition(
+      () => {
+        return gBrowser.getIcon(tab) != null;
+      },
+      "wait for favicon load to finish",
+      100,
+      5
+    );
+  } catch (e) {
+    // This page doesn't have any favicon link, just continue.
+  }
+  expectedTab = expectedTabInfo(tab, win);
+  await BrowserTestUtils.closeWindow(win);
+
+  extension = ExtensionTestUtils.loadExtension({
+    manifest: {
+      permissions: ["sessions", "http://example.com/*"],
+    },
+    background,
+  });
+  await extension.startup();
+
+  extension.sendMessage("check-sessions");
+  recentlyClosed = await extension.awaitMessage("recentlyClosed");
+  tabInfo = recentlyClosed[0].window.tabs[0];
+  checkTabInfo(expectedTab, tabInfo);
+
+  await extension.unload();
 });
diff --git a/browser/components/resistfingerprinting/test/mochitest/mochitest.ini b/browser/components/resistfingerprinting/test/mochitest/mochitest.ini
@@ -14,10 +14,8 @@ scheme = https
 fail-if = xorigin
 [test_reduce_time_precision.html]
 [test_hide_gamepad_info.html]
-skip-if =
-  fission && xorigin  # Bug 1716401 - New fission platform triage
-support-files = test_hide_gamepad_info_iframe.html
 scheme = https
+support-files = test_hide_gamepad_info_iframe.html
 [test_keyboard_event.html]
 [test_pointer_event.html]
   support-files =

diff --git a/browser/components/resistfingerprinting/test/mochitest/test_hide_gamepad_info.html b/browser/components/resistfingerprinting/test/mochitest/test_hide_gamepad_info.html
@@ -15,6 +15,7 @@
     // This test loads in an iframe, to ensure that the navigator instance is
     // loaded with the correct value of the preference.
     var iframe = document.createElement("iframe");
+    iframe.allow = "gamepad";
     iframe.src = "test_hide_gamepad_info_iframe.html";
     document.body.appendChild(iframe);
   });

diff --git a/browser/extensions/formautofill/test/mochitest/creditCard/test_clear_form.html b/browser/extensions/formautofill/test/mochitest/creditCard/test_clear_form.html
@@ -62,9 +62,6 @@
 }
 
 async function confirmClear(selector) {
-  await SpecialPowers.pushPrefEnv({
-    set: [["dom.input_events.beforeinput.enabled", true]],
-  });
   info("Await for clearing input");
   let promise = new Promise(resolve => {
     let beforeInputFired = false;

diff --git a/browser/extensions/formautofill/test/mochitest/formautofill_common.js b/browser/extensions/formautofill/test/mochitest/formautofill_common.js
@@ -134,10 +134,6 @@ async function triggerAutofillAndCheckProfile(profile) {
   const adaptedProfile = _getAdaptedProfile(profile);
   const promises = [];
 
-  await SpecialPowers.pushPrefEnv({
-    set: [["dom.input_events.beforeinput.enabled", true]],
-  });
-
   for (const [fieldName, value] of Object.entries(adaptedProfile)) {
     info(`triggerAutofillAndCheckProfile: ${fieldName}`);
     const element = document.getElementById(fieldName);

diff --git a/browser/extensions/formautofill/test/mochitest/test_multi_locale_CA_address_form.html b/browser/extensions/formautofill/test/mochitest/test_multi_locale_CA_address_form.html
@@ -169,8 +169,7 @@
 add_task(async function setup() {
   // This test relies on being able to fill a Canadian address which isn't possible
   // without `supportedCountries` allowing Canada
-  await SpecialPowers.pushPrefEnv({"set": [["extensions.formautofill.supportedCountries", "US,CA"],
-                                           ["dom.input_events.beforeinput.enabled", true]]});
+  await SpecialPowers.pushPrefEnv({"set": [["extensions.formautofill.supportedCountries", "US,CA"]]});
 
   await setupAddressStorage();
 });

diff --git a/browser/extensions/webcompat/manifest.json b/browser/extensions/webcompat/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Web Compatibility Interventions",
   "description": "Urgent post-release fixes for web compatibility.",
-  "version": "24.1.0",
+  "version": "24.2.0",
 
   "applications": {
     "gecko": {

diff --git a/browser/extensions/webcompat/shims/google-analytics-and-tag-manager.js b/browser/extensions/webcompat/shims/google-analytics-and-tag-manager.js
@@ -140,7 +140,7 @@ if (window[window.GoogleAnalyticsObject || "ga"]?.loaded === undefined) {
 
   Object.assign(ga, {
     create: (a, b, c, d) => ga("create", a, b, c, d),
-    getAll: () => trackers.values(),
+    getAll: () => Array.from(trackers.values()),
     getByName: name => trackers.get(name),
     loaded: true,
     remove: t => ga("remove", t),

diff --git a/browser/themes/linux/customizableui/panelUI.css b/browser/themes/linux/customizableui/panelUI.css
@@ -20,13 +20,30 @@
 }
 } /** END Proton **/
 
+#PlacesToolbar menupopup,
 #BMB_bookmarksPopup menupopup {
   appearance: none;
   background-color: transparent;
+}
+
+#BMB_bookmarksPopup menupopup {
   --panel-background: var(--arrowpanel-background);
   --panel-color: var(--arrowpanel-color);
   --panel-border-color: var(--arrowpanel-border-color);
   margin-top: -9px; /* The top component of --panel-subview-body-padding and the 1px border */
+ }
+
+#PlacesToolbar menupopup {
+  color: var(--arrowpanel-color);
+  padding: 5px 4px 4px;
+  margin-top: -4px;
+}
+
+#PlacesToolbar menupopup[placespopup=true]::part(content) {
+  box-shadow: 0 0 4px hsla(0, 0%, 0%, 0.2);
+  background: var(--arrowpanel-background);
+  border: 1px solid var(--arrowpanel-border-color);
+  margin-top: -1px
 }
 
 menuitem.subviewbutton {

diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
@@ -147,6 +147,19 @@
   list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.svg");
 }
 
+#PlacesToolbar menupopup[placespopup=true]::part(content) {
+  border: 1px solid var(--arrowpanel-border-color) !important;
+}
+
+#PlacesToolbar menupopup > menu .menu-iconic-icon,
+#PlacesToolbar menupopup > menuitem .menu-iconic-icon {
+  margin-inline-end: 0;
+}
+
+#PlacesToolbar menu menupopup {
+  margin-top: -8px;
+}
+
 %include ../shared/toolbarbuttons.inc.css
 %include ../shared/toolbarbutton-icons.inc.css
 %include ../shared/menupanel.inc.css