Merge pull request #685 from Floorp-Projects/upstream-esr115-20240116…

…032046

Pull upstream

.hgtags

@@ -4392,3 +4392,5 @@ bf2f656d025836975b7bf6aeb16901a037a01923 FIREFOX_115_2_0esr_RELEASE
 8a02a7c43f1eddfd18926f0266d188b4f359c0aa FIREFOX_115_5_0esr_BUILD1
 8a02a7c43f1eddfd18926f0266d188b4f359c0aa FIREFOX_115_5_0esr_RELEASE
 aa9f02961b2bbb92e17fea5d6b8fd14c097baf72 FIREFOX_115_6_0esr_BUILD1
+aa9f02961b2bbb92e17fea5d6b8fd14c097baf72 FIREFOX_115_6_0esr_RELEASE
+980ec32f825b2f54c05d16057a6e60d5b62d2ee2 FIREFOX_115_7_0esr_BUILD1

CLOBBER

@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Merge day clobber 2023-11-20
+Merge day clobber 2023-12-18

accessible/base/NotificationController.cpp

@@ -946,7 +946,7 @@ void NotificationController::WillRefresh(mozilla::TimeStamp aTime) {
   }
 
   if (mDocument) {
-    mDocument->ClearMovedAccessibles();
+    mDocument->ClearMutationData();
   }
 
   if (ipc::ProcessChild::ExpectingShutdown()) {

accessible/generic/DocAccessible.cpp

@@ -1035,9 +1035,6 @@ void DocAccessible::ContentRemoved(nsIContent* aChildNode,
     logging::MsgEnd();
   }
 #endif
-  // This one and content removal notification from layout may result in
-  // double processing of same subtrees. If it pops up in profiling, then
-  // consider reusing a document node cache to reject these notifications early.
   ContentRemoved(aChildNode);
 }
 
@@ -2165,6 +2162,10 @@ void DocAccessible::ContentRemoved(LocalAccessible* aChild) {
 }
 
 void DocAccessible::ContentRemoved(nsIContent* aContentNode) {
+  if (!mRemovedNodes.EnsureInserted(aContentNode)) {
+    return;
+  }
+
   // If child node is not accessible then look for its accessible children.
   LocalAccessible* acc = GetAccessible(aContentNode);
   if (acc) {

accessible/generic/DocAccessible.h

@@ -550,12 +550,12 @@ class DocAccessible : public HyperTextAccessibleWrap,
 
   /**
    * Called from NotificationController after all mutation events have been
-   * processed to clear our data about Accessibles that were moved during this
-   * tick.
+   * processed to clear our data about mutations during this tick.
    */
-  void ClearMovedAccessibles() {
+  void ClearMutationData() {
     mMovedAccessibles.Clear();
     mInsertedAccessibles.Clear();
+    mRemovedNodes.Clear();
   }
 
   /**
@@ -815,6 +815,9 @@ class DocAccessible : public HyperTextAccessibleWrap,
   // processes. This is needed to prevent insertions + moves of the same
   // Accessible in the same tick from being tracked as moves.
   nsTHashSet<RefPtr<LocalAccessible>> mInsertedAccessibles;
+  // A set of DOM nodes removed during this tick. This avoids a lot of pointless
+  // recursive DOM traversals.
+  nsTHashSet<nsIContent*> mRemovedNodes;
 };
 
 inline DocAccessible* LocalAccessible::AsDoc() {

browser/components/enterprisepolicies/Policies.sys.mjs

@@ -1695,6 +1695,7 @@ export var Policies = {
     onBeforeAddons(manager, param) {
       let allowedPrefixes = [
         "accessibility.",
+        "alerts.",
         "app.update.",
         "browser.",
         "datareporting.policy.",

browser/components/search/test/unit/test_search_telemetry_config_validation.js

@@ -4,6 +4,7 @@
 "use strict";
 
 ChromeUtils.defineESModuleGetters(this, {
+  AppConstants: "resource://gre/modules/AppConstants.sys.mjs",
   RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
   TELEMETRY_SETTINGS_KEY: "resource:///modules/SearchSERPTelemetry.sys.mjs",
   JsonSchema: "resource://gre/modules/JsonSchema.sys.mjs",
@@ -32,6 +33,17 @@ function isObject(value) {
  *   The section to check to see if an additionalProperties flag should be added.
  */
 function disallowAdditionalProperties(section) {
+  // It is generally acceptable for new properties to be added to the
+  // configuration as older builds will ignore them.
+  //
+  // As a result, we only check for new properties on nightly builds, and this
+  // avoids us having to uplift schema changes. This also helps preserve the
+  // schemas as documentation of "what was supported in this version".
+  if (!AppConstants.NIGHTLY_BUILD) {
+    info("Skipping additional properties validation.");
+    return;
+  }
+
   if (section.type == "object") {
     section.additionalProperties = false;
   }

browser/config/version.txt

@@ -1 +1 @@
-115.6.0
+115.7.0

browser/config/version_display.txt

@@ -1 +1 @@
-11.7.1
+11.8.0

browser/locales/en-US/browser/newtab/asrouter.ftl

@@ -243,7 +243,14 @@ fxa-sync-cfr-secondary = Remind me later
 
 ## Device Migration FxA Spotlight
 
-device-migration-fxa-spotlight-header = Using an older device?
-device-migration-fxa-spotlight-body = Back up your data to make sure you don’t lose important info like bookmarks and passwords — especially if you switch to a new device.
-device-migration-fxa-spotlight-primary-button = How to back up my data
-device-migration-fxa-spotlight-link = Remind me later
+device-migration-fxa-spotlight-heavy-user-header = Don’t forget to back up your data
+device-migration-fxa-spotlight-heavy-user-body = Make sure important info — like bookmarks and passwords — is updated and protected across all your devices.
+device-migration-fxa-spotlight-heavy-user-primary-button = Get started
+
+device-migration-fxa-spotlight-older-device-header = Peace of mind, from { -brand-product-name }
+device-migration-fxa-spotlight-older-device-body = An account keeps your important info updated and protected on any device you connect.
+device-migration-fxa-spotlight-older-device-primary-button = Create an account
+
+device-migration-fxa-spotlight-getting-new-device-header-2 = New device in your future?
+device-migration-fxa-spotlight-getting-new-device-body-2 = Follow a few simple steps to bring your bookmarks, history, and passwords with you when you get started on a new device.
+device-migration-fxa-spotlight-getting-new-device-primary-button = How to back up my data