Merge pull request #1303 from Floorp-Projects/upstream-esr115-2024080…

…7122306

Pull upstream

.hgtags

@@ -4407,3 +4407,10 @@ f65068dc82bf6051f520551ba5497a5985877d47 FIREFOX_115_9_1esr_RELEASE
 36d2dde067333d0c181cb8e21b12b73c307575db FIREFOX_115_11_0esr_BUILD1
 36d2dde067333d0c181cb8e21b12b73c307575db FIREFOX_115_11_0esr_RELEASE
 6b05ad1f5f2dbb0d47ac169115e250ff3776289c FIREFOX_115_12_0esr_BUILD1
+6b05ad1f5f2dbb0d47ac169115e250ff3776289c FIREFOX_115_12_0esr_RELEASE
+b7e26a68acf99da1a8a4a33f4768f18817377f9e FIREFOX_115_13_0esr_BUILD2
+2ac22c53b238cae73c2e72915e2a423dcfa7f099 FIREFOX_115_13_0esr_BUILD3
+2ac22c53b238cae73c2e72915e2a423dcfa7f099 FIREFOX_115_13_0esr_RELEASE
+5983e691ecd90f7b5dbc6e7353299ebdd11a8493 FIREFOX_115_14_0esr_BUILD1
+e1174a2473ad7e8fdde28d29e2e9e14ae1f15a72 FIREFOX_115_14_0esr_BUILD2
+e1174a2473ad7e8fdde28d29e2e9e14ae1f15a72 FIREFOX_115_14_0esr_RELEASE

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 2024-06-10
+Merge day clobber 2024-08-05

accessible/generic/LocalAccessible.cpp

@@ -1905,7 +1905,7 @@ void LocalAccessible::ActionNameAt(uint8_t aIndex, nsAString& aName) {
   }
 
   if (ActionAncestor()) {
-    aName.AssignLiteral("click ancestor");
+    aName.AssignLiteral("clickAncestor");
     return;
   }
 }

accessible/ipc/DocAccessibleChildBase.cpp

@@ -47,7 +47,7 @@ AccessibleData DocAccessibleChildBase::SerializeAcc(LocalAccessible* aAcc) {
     // action. However, that requires an ancestor walk which is too expensive
     // here. eActionable is only used by ATK. For now, we only expose ancestor
     // actions on text leaf and image Accessibles. This means that we don't
-    // support "click ancestor" for ATK.
+    // support "clickAncestor" for ATK.
     if (aAcc->ActionCount()) {
       genericTypes |= eActionable;
     }

accessible/ipc/RemoteAccessibleBase.cpp

@@ -1698,7 +1698,7 @@ void RemoteAccessibleBase<Derived>::ActionNameAt(uint8_t aIndex,
         if (action) {
           action->ToString(aName);
         } else if (hasActionAncestor) {
-          aName.AssignLiteral("click ancestor");
+          aName.AssignLiteral("clickAncestor");
         } else if (mCachedFields->HasAttribute(nsGkAtoms::longdesc)) {
           aName.AssignLiteral("showlongdesc");
         }

accessible/tests/browser/e10s/browser_caching_actions.js

@@ -20,7 +20,7 @@ const gActionDescrMap = {
   expand: "Expand",
   activate: "Activate",
   cycle: "Cycle",
-  "click ancestor": "Click ancestor",
+  clickAncestor: "Click ancestor",
 };
 
 async function testActions(browser, docAcc, id, expectedActions, domEvents) {
@@ -116,9 +116,9 @@ addAccessibleTask(
     await _testActions("link1", ["jump"], gClickEvents);
     await _testActions("link2", ["click"], gClickEvents);
     await _testActions("link3", ["jump"], gClickEvents);
-    await _testActions("link3img", ["click ancestor"], gClickEvents);
+    await _testActions("link3img", ["clickAncestor"], gClickEvents);
     await _testActions("label1", ["click"], gClickEvents);
-    await _testActions("p_in_clickable_div", ["click ancestor"], gClickEvents);
+    await _testActions("p_in_clickable_div", ["clickAncestor"], gClickEvents);
 
     await invokeContentTask(browser, [], () => {
       content.document
@@ -174,8 +174,8 @@ addAccessibleTask(
     const link1Acc = findAccessibleChildByID(docAcc, "link1");
     is(
       link1Acc.firstChild.getActionName(0),
-      "click ancestor",
-      "linkable child has click ancestor action"
+      "clickAncestor",
+      "linkable child has clickAncestor action"
     );
     await invokeContentTask(browser, [], () => {
       let link1 = content.document.getElementById("link1");
@@ -189,7 +189,7 @@ addAccessibleTask(
       content.document.body.onclick = () => {};
     });
     await untilCacheIs(() => docAcc.actionCount, 1, "Doc has 1 action");
-    await _testActions("link1", ["click ancestor"]);
+    await _testActions("link1", ["clickAncestor"]);
 
     await invokeContentTask(browser, [], () => {
       content.document.body.onclick = null;
@@ -203,7 +203,7 @@ addAccessibleTask(
       content.document.documentElement.onclick = () => {};
     });
     await untilCacheIs(() => docAcc.actionCount, 1, "Doc has 1 action");
-    await _testActions("link1", ["click ancestor"]);
+    await _testActions("link1", ["clickAncestor"]);
   },
   {
     chrome: true,

accessible/tests/mochitest/actions.js

@@ -227,5 +227,5 @@ var gActionDescrMap = {
   expand: "Expand",
   activate: "Activate",
   cycle: "Cycle",
-  "click ancestor": "Click ancestor",
+  clickAncestor: "Click ancestor",
 };

accessible/tests/mochitest/actions/test_link.html

@@ -65,7 +65,7 @@
         {
           ID: "img1",
           targetID: "link1",
-          actionName: "click ancestor",
+          actionName: "clickAncestor",
           events: CLICK_EVENTS,
           allowBubbling: true,
           eventSeq: [
@@ -80,7 +80,7 @@
         {
           ID: "img2",
           targetID: "link2",
-          actionName: "click ancestor",
+          actionName: "clickAncestor",
           events: CLICK_EVENTS,
           allowBubbling: true,
         },
@@ -92,7 +92,7 @@
         {
           ID: "img3",
           targetID: "link3",
-          actionName: "click ancestor",
+          actionName: "clickAncestor",
           events: CLICK_EVENTS,
           allowBubbling: true,
         },
@@ -104,7 +104,7 @@
         {
           ID: "img4",
           targetID: "link4",
-          actionName: "click ancestor",
+          actionName: "clickAncestor",
           events: CLICK_EVENTS,
           allowBubbling: true,
         },

accessible/tests/mochitest/elm/test_HTMLSpec.html

@@ -38,7 +38,7 @@
           {
             role: ROLE_TEXT_LEAF,
             states: STATE_LINKED,
-            actions: "click ancestor",
+            actions: "clickAncestor",
           },
         ],
       };

accessible/tests/mochitest/test_nsIAccessibleImage.html

@@ -109,7 +109,7 @@
       testThis("nonLinkedImage", "moz.png", 89, 38);
 
       // Test linked image
-      var actionNamesArray = ["click ancestor"];
+      var actionNamesArray = ["clickAncestor"];
       testThis("linkedImage", "moz.png", 89, 38, 1,
                actionNamesArray);
 

browser/branding/aurora/branding.nsi

@@ -24,7 +24,7 @@
 
 # The installer's certificate name and issuer expected by the stub installer
 !define CertNameDownload   "Mozilla Corporation"
-!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA"
+!define CertIssuerDownload "DigiCert Trusted G4 Code Signing RSA4096 SHA384 2021 CA1"
 
 # Dialog units are used so the UI displays correctly with the system's DPI
 # settings.

browser/branding/nightly/branding.nsi

@@ -23,7 +23,7 @@
 
 # The installer's certificate name and issuer expected by the stub installer
 !define CertNameDownload   "Mozilla Corporation"
-!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA"
+!define CertIssuerDownload "DigiCert Trusted G4 Code Signing RSA4096 SHA384 2021 CA1"
 
 # Dialog units are used so the UI displays correctly with the system's DPI
 # settings.

browser/branding/unofficial/branding.nsi

@@ -23,7 +23,7 @@
 
 # The installer's certificate name and issuer expected by the stub installer
 !define CertNameDownload   "Mozilla Corporation"
-!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA"
+!define CertIssuerDownload "DigiCert Trusted G4 Code Signing RSA4096 SHA384 2021 CA1"
 
 # Dialog units are used so the UI displays correctly with the system's DPI
 # settings.

browser/components/search/extensions/qwant/manifest.json

@@ -1,17 +1,17 @@
 {
   "name": "Qwant",
   "manifest_version": 2,
-  "version": "1.4",
+  "version": "1.5",
   "browser_specific_settings": {
     "gecko": {
       "id": "[email protected]"
     }
   },
   "hidden": true,
   "icons": {
-    "16": "favicon.ico"
+    "16": "favicon.png"
   },
-  "web_accessible_resources": ["favicon.ico"],
+  "web_accessible_resources": ["favicon.png"],
   "chrome_settings_overrides": {
     "search_provider": {
       "keyword": "@qwant",

browser/config/version.txt

@@ -1 +1 @@
-115.13.0
+115.15.0

browser/extensions/webcompat/shims/facebook-sdk.js

@@ -26,7 +26,24 @@ if (!window.FB) {
   const FacebookLogoURL = "https://smartblock.firefox.etp/facebook.svg";
   const PlayIconURL = "https://smartblock.firefox.etp/play.svg";
 
-  const originalUrl = document.currentScript.src;
+  const originalUrl = (() => {
+    const src = document.currentScript?.src;
+    try {
+      const { protocol, hostname, pathname, href } = new URL(src);
+      if (
+        (protocol === "http:" || protocol === "https:") &&
+        hostname === "connect.facebook.net" &&
+        (pathname.endsWith("/sdk.js") || pathname.endsWith("/all.js"))
+      ) {
+        return href;
+      }
+      if (href.includes("all.js")) {
+        // Legacy SDK.
+        return "https://connect.facebook.net/en_US/all.js";
+      }
+    } catch (_) {}
+    return "https://connect.facebook.net/en_US/sdk.js";
+  })();
 
   let haveUnshimmed;
   let initInfo;

browser/extensions/webcompat/shims/live-test-shim.js

@@ -7,7 +7,8 @@
 /* globals browser */
 
 if (!window.LiveTestShimPromise) {
-  const originalUrl = document.currentScript.src;
+  const originalUrl =
+    "https://webcompat-addon-testbed.herokuapp.com/shims_test.js";
 
   const shimId = "LiveTestShim";
 

browser/extensions/webcompat/shims/mochitest-shim-1.js

@@ -7,7 +7,8 @@
 /* globals browser */
 
 if (!window.MochitestShimPromise) {
-  const originalUrl = document.currentScript.src;
+  const originalUrl =
+    "http://example.com/browser/browser/extensions/webcompat/tests/browser/shims_test.js";
 
   const shimId = "MochitestShim";
 

browser/extensions/webcompat/shims/mochitest-shim-2.js

@@ -7,7 +7,8 @@
 /* globals browser */
 
 if (!window.testPromise) {
-  const originalUrl = document.currentScript.src;
+  const originalUrl =
+    "http://example.com/browser/browser/extensions/webcompat/tests/browser/shims_test_2.js";
 
   const shimId = "MochitestShim2";
 

browser/extensions/webcompat/shims/rambler-authenticator.js

@@ -5,7 +5,20 @@
 "use strict";
 
 if (!window.ramblerIdHelper) {
-  const originalScript = document.currentScript.src;
+  const originalScript = (() => {
+    const src = document.currentScript?.src;
+    try {
+      const { protocol, hostname, pathname, href } = new URL(src);
+      if (
+        (protocol === "http:" || protocol === "https:") &&
+        hostname === "id.rambler.ru" &&
+        pathname === "rambler-id-helper/auth_events.js"
+      ) {
+        return href;
+      }
+    } catch (_) {}
+    return "https://id.rambler.ru/rambler-id-helper/auth_events.js";
+  })();
 
   const sendMessageToAddon = (function () {
     const shimId = "Rambler";

browser/extensions/webcompat/shims/vidible.js

@@ -15,7 +15,21 @@
 if (!window.vidible?.version) {
   const PlayIconURL = "https://smartblock.firefox.etp/play.svg";
 
-  const originalScript = document.currentScript.src;
+  const originalScript = (() => {
+    const src = document.currentScript?.src;
+    try {
+      const { protocol, hostname, pathname, href } = new URL(src);
+      if (
+        (protocol === "http:" || protocol === "https:") &&
+        pathname.endsWith("/vidible-min.js") &&
+        (hostname.endsWith(".vidible.tv") ||
+          hostname === "vdb-cdn-files.s3.amazonaws.com")
+      ) {
+        return href;
+      }
+    } catch (_) {}
+    return "https://cdn-ssl.vidible.tv/prod/player/js/21.1.1/vidible-min.js";
+  })();
 
   const getGUID = () => {
     const v = crypto.getRandomValues(new Uint8Array(20));