Merge commit '40205f1b55f1ba8a26fcbd362c20d843e8718a87'

FascodeNet · Feb 4, 2021 · beeaa14 · beeaa14
2 parents 826d27b + 40205f1
commit beeaa14
Show file tree

Hide file tree

Showing 473 changed files with 7,959 additions and 4,062 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/a.patch b/a.patch
diff --git a/accessible/base/DocManager.cpp b/accessible/base/DocManager.cpp
@@ -91,20 +91,22 @@ Accessible* DocManager::FindAccessibleInCache(nsINode* aNode) const {
   return nullptr;
 }
 
-void DocManager::RemoveFromXPCDocumentCache(DocAccessible* aDocument) {
+void DocManager::RemoveFromXPCDocumentCache(DocAccessible* aDocument,
+                                            bool aAllowServiceShutdown) {
   xpcAccessibleDocument* xpcDoc = mXPCDocumentCache.GetWeak(aDocument);
   if (xpcDoc) {
     xpcDoc->Shutdown();
     mXPCDocumentCache.Remove(aDocument);
 
-    if (!HasXPCDocuments()) {
+    if (aAllowServiceShutdown && !HasXPCDocuments()) {
       MaybeShutdownAccService(nsAccessibilityService::eXPCOM);
     }
   }
 }
 
 void DocManager::NotifyOfDocumentShutdown(DocAccessible* aDocument,
-                                          Document* aDOMDocument) {
+                                          Document* aDOMDocument,
+                                          bool aAllowServiceShutdown) {
   // We need to remove listeners in both cases, when document is being shutdown
   // or when accessibility service is being shut down as well.
   RemoveListeners(aDOMDocument);
@@ -115,7 +117,7 @@ void DocManager::NotifyOfDocumentShutdown(DocAccessible* aDocument,
     return;
   }
 
-  RemoveFromXPCDocumentCache(aDocument);
+  RemoveFromXPCDocumentCache(aDocument, aAllowServiceShutdown);
   mDocAccessibleCache.Remove(aDOMDocument);
 }
 

diff --git a/accessible/base/DocManager.h b/accessible/base/DocManager.h
@@ -56,11 +56,15 @@ class DocManager : public nsIWebProgressListener,
 
   /**
    * Called by document accessible when it gets shutdown.
+   * @param aAllowServiceShutdown true to shut down nsAccessibilityService
+   *        if it is no longer required, false to prevent it.
    */
   void NotifyOfDocumentShutdown(DocAccessible* aDocument,
-                                dom::Document* aDOMDocument);
+                                dom::Document* aDOMDocument,
+                                bool aAllowServiceShutdown = true);
 
-  void RemoveFromXPCDocumentCache(DocAccessible* aDocument);
+  void RemoveFromXPCDocumentCache(DocAccessible* aDocument,
+                                  bool aAllowServiceShutdown = true);
 
   /**
    * Return XPCOM accessible document.

diff --git a/accessible/generic/DocAccessible.cpp b/accessible/generic/DocAccessible.cpp
@@ -396,6 +396,9 @@ void DocAccessible::Shutdown() {
 
   RemoveEventListeners();
 
+  // mParent->RemoveChild clears mParent, but we need to know whether we were a
+  // child later, so use a flag.
+  const bool isChild = !!mParent;
   if (mParent) {
     DocAccessible* parentDocument = mParent->Document();
     if (parentDocument) parentDocument->RemoveChildDocument(this);
@@ -404,6 +407,9 @@ void DocAccessible::Shutdown() {
     MOZ_ASSERT(!mParent, "Parent has to be null!");
   }
 
+  mPresShell->SetDocAccessible(nullptr);
+  mPresShell = nullptr;  // Avoid reentrancy
+
   // Walk the array backwards because child documents remove themselves from the
   // array as they are shutdown.
   int32_t childDocCount = mChildDocuments.Length();
@@ -424,9 +430,6 @@ void DocAccessible::Shutdown() {
     mVirtualCursor = nullptr;
   }
 
-  mPresShell->SetDocAccessible(nullptr);
-  mPresShell = nullptr;  // Avoid reentrancy
-
   mDependentIDsHashes.Clear();
   mNodeToAccessibleMap.Clear();
 
@@ -446,7 +449,13 @@ void DocAccessible::Shutdown() {
 
   HyperTextAccessibleWrap::Shutdown();
 
-  GetAccService()->NotifyOfDocumentShutdown(this, mDocumentNode);
+  MOZ_ASSERT(GetAccService());
+  GetAccService()->NotifyOfDocumentShutdown(
+      this, mDocumentNode,
+      // Make sure we don't shut down AccService while a parent document is
+      // still shutting down. The parent will allow service shutdown when it
+      // reaches this point.
+      /* aAllowServiceShutdown */ !isChild);
   mDocumentNode = nullptr;
 }
 

diff --git a/browser/base/content/test/forms/browser_selectpopup.js b/browser/base/content/test/forms/browser_selectpopup.js
@@ -649,7 +649,10 @@ async function performLargePopupTests(win) {
   EventUtils.synthesizeMouseAtPoint(
     popupRect.left + 5,
     popupRect.top - 10,
-    { type: "mousemove" },
+    {
+      type: "mousemove",
+      buttons: 1,
+    },
     win
   );
   is(
@@ -661,7 +664,10 @@ async function performLargePopupTests(win) {
   EventUtils.synthesizeMouseAtPoint(
     popupRect.left + 20,
     popupRect.top + 10,
-    { type: "mousemove" },
+    {
+      type: "mousemove",
+      buttons: 1,
+    },
     win
   );
 
@@ -675,7 +681,10 @@ async function performLargePopupTests(win) {
   EventUtils.synthesizeMouseAtPoint(
     popupRect.left + 20,
     popupRect.top - 20,
-    { type: "mousemove" },
+    {
+      type: "mousemove",
+      buttons: 1,
+    },
     win
   );
   await scrolledPromise;
@@ -692,7 +701,10 @@ async function performLargePopupTests(win) {
   EventUtils.synthesizeMouseAtPoint(
     popupRect.left + 20,
     popupRect.bottom + 20,
-    { type: "mousemove" },
+    {
+      type: "mousemove",
+      buttons: 1,
+    },
     win
   );
   await scrolledPromise;
@@ -739,7 +751,10 @@ async function performLargePopupTests(win) {
   EventUtils.synthesizeMouseAtPoint(
     popupRect.left + 20,
     popupRect.bottom + 20,
-    { type: "mousemove" },
+    {
+      type: "mousemove",
+      buttons: 1,
+    },
     win
   );
   await scrolledPromise;
@@ -755,7 +770,10 @@ async function performLargePopupTests(win) {
   EventUtils.synthesizeMouseAtPoint(
     popupRect.left + 20,
     popupRect.top - 20,
-    { type: "mousemove" },
+    {
+      type: "mousemove",
+      buttons: 1,
+    },
     win
   );
   await scrolledPromise;
@@ -1042,6 +1060,7 @@ add_task(async function test_mousemove_correcttarget() {
 
     EventUtils.synthesizeMouseAtCenter(selectPopup.firstElementChild, {
       type: "mousemove",
+      buttons: 1,
     });
   });
 

diff --git a/browser/components/enterprisepolicies/Policies.jsm b/browser/components/enterprisepolicies/Policies.jsm
@@ -1492,6 +1492,7 @@ var Policies = {
     onBeforeAddons(manager, param) {
       const allowedPrefixes = [
         "accessibility.",
+        "app.update.",
         "browser.",
         "datareporting.policy.",
         "dom.",
@@ -1523,7 +1524,11 @@ var Policies = {
         "security.tls.version.enable-deprecated",
         "security.warn_submit_secure_to_insecure",
       ];
-      const blockedPrefs = [];
+      const blockedPrefs = [
+        "app.update.channel",
+        "app.update.lastUpdateTime",
+        "app.update.migrated",
+      ];
 
       for (let preference in param) {
         if (blockedPrefs.includes(preference)) {

diff --git a/browser/components/newtab/aboutwelcome/content/aboutwelcome.bundle.js b/browser/components/newtab/aboutwelcome/content/aboutwelcome.bundle.js
@@ -629,6 +629,15 @@ class WelcomeScreen extends react__WEBPACK_IMPORTED_MODULE_0___default.a.PureCom
           muted: "true",
           src: _lib_aboutwelcome_utils__WEBPACK_IMPORTED_MODULE_3__["AboutWelcomeUtils"].hasDarkMode() ? this.props.content.tiles.source.dark : this.props.content.tiles.source.default
         })) : null;
+
+      case "image":
+        return this.props.content.tiles.source ? react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
+          className: `${this.props.content.tiles.media_type}`
+        }, react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("img", {
+          src: _lib_aboutwelcome_utils__WEBPACK_IMPORTED_MODULE_3__["AboutWelcomeUtils"].hasDarkMode() && this.props.content.tiles.source.dark ? this.props.content.tiles.source.dark : this.props.content.tiles.source.default,
+          role: "presentation",
+          alt: ""
+        })) : null;
     }
 
     return null;

diff --git a/browser/components/newtab/content-src/aboutwelcome/components/MultiStageAboutWelcome.jsx b/browser/components/newtab/content-src/aboutwelcome/components/MultiStageAboutWelcome.jsx
@@ -342,6 +342,21 @@ export class WelcomeScreen extends React.PureComponent {
             />
           </div>
         ) : null;
+      case "image":
+        return this.props.content.tiles.source ? (
+          <div className={`${this.props.content.tiles.media_type}`}>
+            <img
+              src={
+                AboutWelcomeUtils.hasDarkMode() &&
+                this.props.content.tiles.source.dark
+                  ? this.props.content.tiles.source.dark
+                  : this.props.content.tiles.source.default
+              }
+              role="presentation"
+              alt=""
+            />
+          </div>
+        ) : null;
     }
     return null;
   }

diff --git a/browser/components/newtab/content-src/components/CustomizeMenu/_CustomizeMenu.scss b/browser/components/newtab/content-src/components/CustomizeMenu/_CustomizeMenu.scss
@@ -146,6 +146,7 @@
       padding-block: 7px;
       padding-inline: 10px 13px;
       margin-inline-start: 2px;
+      margin-bottom: 2px;
       -moz-context-properties: fill;
       fill: var(--customize-menu-primary-text-color);
       background: url('#{$image-path}glyph-arrowhead-down-12.svg') right no-repeat;

diff --git a/browser/components/newtab/css/activity-stream-linux.css b/browser/components/newtab/css/activity-stream-linux.css
@@ -1771,6 +1771,7 @@ main {
       padding-block: 7px;
       padding-inline: 10px 13px;
       margin-inline-start: 2px;
+      margin-bottom: 2px;
       -moz-context-properties: fill;
       fill: var(--customize-menu-primary-text-color);
       background: url("chrome://activity-stream/content/data/content/assets/glyph-arrowhead-down-12.svg") right no-repeat;

diff --git a/browser/components/newtab/css/activity-stream-mac.css b/browser/components/newtab/css/activity-stream-mac.css
@@ -1774,6 +1774,7 @@ main {
       padding-block: 7px;
       padding-inline: 10px 13px;
       margin-inline-start: 2px;
+      margin-bottom: 2px;
       -moz-context-properties: fill;
       fill: var(--customize-menu-primary-text-color);
       background: url("chrome://activity-stream/content/data/content/assets/glyph-arrowhead-down-12.svg") right no-repeat;

diff --git a/browser/components/newtab/css/activity-stream-windows.css b/browser/components/newtab/css/activity-stream-windows.css
@@ -1771,6 +1771,7 @@ main {
       padding-block: 7px;
       padding-inline: 10px 13px;
       margin-inline-start: 2px;
+      margin-bottom: 2px;
       -moz-context-properties: fill;
       fill: var(--customize-menu-primary-text-color);
       background: url("chrome://activity-stream/content/data/content/assets/glyph-arrowhead-down-12.svg") right no-repeat;

diff --git a/browser/components/newtab/test/browser/browser_aboutwelcome_multistage.js b/browser/components/newtab/test/browser/browser_aboutwelcome_multistage.js
@@ -81,6 +81,14 @@ const TEST_MULTISTAGE_CONTENT = {
       order: 2,
       content: {
         title: "Step 3",
+        tiles: {
+          type: "image",
+          media_type: "test-img",
+          source: {
+            default:
+              "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZmlsbD0iIzQ1YTFmZiIgZmlsbC1vcGFjaXR5PSJjb250ZXh0LWZpbGwtb3BhY2l0eSIgZD0iTTE1Ljg0NSA2LjA2NEExLjEgMS4xIDAgMCAwIDE1IDUuMzMxTDEwLjkxMSA0LjYgOC45ODUuNzM1YTEuMSAxLjEgMCAwIDAtMS45NjkgMEw1LjA4OSA0LjZsLTQuMDgxLjcyOWExLjEgMS4xIDAgMCAwLS42MTUgMS44MzRMMy4zMiAxMC4zMWwtLjYwOSA0LjM2YTEuMSAxLjEgMCAwIDAgMS42IDEuMTI3TDggMTMuODczbDMuNjkgMS45MjdhMS4xIDEuMSAwIDAgMCAxLjYtMS4xMjdsLS42MS00LjM2MyAyLjkyNi0zLjE0NmExLjEgMS4xIDAgMCAwIC4yMzktMS4xeiIvPjwvc3ZnPg==",
+          },
+        },
         primary_button: {
           label: "Next",
           action: {
@@ -308,7 +316,7 @@ add_task(async function test_multistage_aboutwelcome_experimentAPI() {
       "div.tiles-container.info",
     ],
     // Unexpected selectors:
-    ["main.AW_STEP1", "main.AW_STEP3", "div.secondary-cta.top"]
+    ["main.AW_STEP1", "main.AW_STEP3", "div.secondary-cta.top", "div.test-img"]
   );
   await onButtonClick(browser, "button.primary");
   await test_screen_content(
@@ -321,6 +329,7 @@ add_task(async function test_multistage_aboutwelcome_experimentAPI() {
       "div.brand-logo",
       "div.welcome-text",
       "p.helptext",
+      "div.test-img",
     ],
     // Unexpected selectors:
     ["main.AW_STEP1", "main.AW_STEP2"]

diff --git a/browser/components/sessionstore/test/browser.ini b/browser/components/sessionstore/test/browser.ini
@@ -140,7 +140,6 @@ skip-if = fission # Bug 1572084
 [browser_sizemodeBeforeMinimized.js]
 [browser_tab_label_during_restore.js]
 [browser_swapDocShells.js]
-fail-if = sessionHistoryInParent # Bug 1602501
 [browser_switch_remoteness.js]
 run-if = e10s
 [browser_upgrade_backup.js]

diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm
@@ -2931,7 +2931,9 @@ class UrlbarInput {
 
     // Autofill only when text is inserted (i.e., event.data is not empty) and
     // it's not due to pasting.
-    let allowAutofill =
+    const allowAutofill =
+      (!UrlbarPrefs.get("keepPanelOpenDuringImeComposition") ||
+        compositionState !== UrlbarUtils.COMPOSITION.COMPOSING) &&
       !!event.data &&
       !UrlbarUtils.isPasteEvent(event) &&
       this._maybeAutofillOnInput(value);

diff --git a/browser/components/urlbar/tests/browser/browser_ime_composition.js b/browser/components/urlbar/tests/browser/browser_ime_composition.js
@@ -63,6 +63,7 @@ add_task(async function() {
     await test_composition(val);
     await test_composition_searchMode_preview(val);
     await test_composition_tabToSearch(val);
+    await test_composition_autofill(val);
   }
 });
 
@@ -287,3 +288,35 @@ async function test_composition_tabToSearch(keepPanelOpenDuringImeComposition) {
   });
   await UrlbarTestUtils.exitSearchMode(window);
 }
+
+async function test_composition_autofill(keepPanelOpenDuringImeComposition) {
+  info("Check whether autofills or not");
+  await UrlbarTestUtils.promisePopupClose(window);
+
+  info("Check the urlbar value during composition");
+  composeAndCheckPanel("m", false);
+
+  if (keepPanelOpenDuringImeComposition) {
+    info("Wait for search suggestions");
+    await UrlbarTestUtils.promiseSearchComplete(window);
+  }
+
+  Assert.equal(
+    gURLBar.value,
+    "m",
+    "The urlbar value is not autofilled while turning IME on"
+  );
+
+  info("Check the urlbar value after committing composition");
+  await UrlbarTestUtils.promisePopupOpen(window, () => {
+    EventUtils.synthesizeComposition({
+      type: "compositioncommitasis",
+      key: { key: "KEY_Enter" },
+    });
+  });
+  await UrlbarTestUtils.promiseSearchComplete(window);
+  Assert.equal(gURLBar.value, "mozilla.org/", "The urlbar value is autofilled");
+
+  // Clean-up.
+  gURLBar.value = "";
+}