Merge pull request #1565 from Floorp-Projects/upstream-esr128-2025010…

…7115437

Pull upstream

.hgtags

@@ -5088,3 +5088,10 @@ e0c969a3bfc0a23219384269e5b36a589c8f6cc5 FIREFOX_128_3_1esr_RELEASE
 c4a5d008ee64fab523384408fa2868e2d028025d FIREFOX_128_4_0esr_BUILD1
 c4a5d008ee64fab523384408fa2868e2d028025d FIREFOX_128_4_0esr_RELEASE
 68352da82b95d7114af99b268c179195fd2fead0 FIREFOX_128_5_0esr_BUILD1
+68352da82b95d7114af99b268c179195fd2fead0 FIREFOX_128_5_0esr_RELEASE
+a6cdcd2ed9ec3e256f358010672bafd1674b0b8b FIREFOX_128_5_1esr_BUILD1
+a6cdcd2ed9ec3e256f358010672bafd1674b0b8b FIREFOX_128_5_1esr_RELEASE
+f2cc51880bf4f49bfe087a2cc569388cab97242e FIREFOX_128_5_2esr_BUILD1
+f2cc51880bf4f49bfe087a2cc569388cab97242e FIREFOX_128_5_2esr_RELEASE
+4f008c71b12e001ae54b7fcd4787b266764c28bf FIREFOX_128_6_0esr_BUILD1
+4f008c71b12e001ae54b7fcd4787b266764c28bf FIREFOX_128_6_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-10-28
+Merge day clobber 2025-01-06

accessible/windows/ia2/ia2Accessible.cpp

@@ -12,12 +12,14 @@
 #include "AccessibleStates.h"
 
 #include "AccAttributes.h"
+#include "ApplicationAccessible.h"
 #include "Compatibility.h"
 #include "ia2AccessibleRelation.h"
 #include "IUnknownImpl.h"
 #include "nsCoreUtils.h"
 #include "nsIAccessibleTypes.h"
 #include "mozilla/a11y/PDocAccessible.h"
+#include "mozilla/StaticPrefs_accessibility.h"
 #include "Relation.h"
 #include "TextRange-inl.h"
 #include "nsAccessibilityService.h"
@@ -352,6 +354,22 @@ ia2Accessible::get_windowHandle(HWND* aWindowHandle) {
   if (!acc) return CO_E_OBJNOTCONNECTED;
 
   *aWindowHandle = MsaaAccessible::GetHWNDFor(acc);
+  if (!*aWindowHandle && !StaticPrefs::accessibility_uia_enable()) {
+    // Bug 1890155: This can happen if a document is detached from its embedder.
+    // The document might be about to die or it might be moving to a different
+    // embedder; e.g. a tab in a different window. The IA2 -> UIA proxy may
+    // crash if we return a null HWND. For now, pick an arbitrary top level
+    // Gecko HWND. This might be wrong, but only briefly, since the document
+    // will either die or move very soon, at which point this method will
+    // return the correct answer.
+    // TODO This hack should be removed once we only use our native UIA
+    // implementation.
+    if (ApplicationAccessible* app = ApplicationAcc()) {
+      if (LocalAccessible* firstRoot = app->LocalFirstChild()) {
+        *aWindowHandle = MsaaAccessible::GetHWNDFor(firstRoot);
+      }
+    }
+  }
   return S_OK;
 }
 

browser/app/profile/firefox.js

@@ -1194,15 +1194,9 @@ pref("network.manage-offline-status", true);
 
 // We want to make sure mail URLs are handled externally...
 pref("network.protocol-handler.external.mailto", true); // for mail
-#ifdef XP_WIN
-  pref("network.protocol-handler.external.ms-windows-store", true);
-#endif
 
 // ...without warning dialogs
 pref("network.protocol-handler.warn-external.mailto", false);
-#ifdef XP_WIN
-  pref("network.protocol-handler.warn-external.ms-windows-store", false);
-#endif
 
 // By default, all protocol handlers are exposed.  This means that
 // the browser will respond to openURL commands for all URL types.
@@ -2427,10 +2421,6 @@ pref("signon.showAutoCompleteFooter", true);
 pref("signon.showAutoCompleteImport", "import");
 pref("signon.suggestImportCount", 3);
 
-// Space separated list of URLS that are allowed to send objects (instead of
-// only strings) through webchannels. Bug 1275612 tracks removing this pref and capability.
-pref("webchannel.allowObject.urlWhitelist", "https://content.cdn.mozilla.net https://install.mozilla.org");
-
 // Whether or not the browser should scan for unsubmitted
 // crash reports, and then show a notification for submitting
 // those reports.

browser/base/content/test/general/browser_remoteTroubleshoot.js

@@ -13,9 +13,6 @@ const TEST_URL_TAIL =
   "example.com/browser/browser/base/content/test/general/test_remoteTroubleshoot.html";
 const TEST_URI_GOOD = Services.io.newURI("https://" + TEST_URL_TAIL);
 const TEST_URI_BAD = Services.io.newURI("http://" + TEST_URL_TAIL);
-const TEST_URI_GOOD_OBJECT = Services.io.newURI(
-  "https://" + TEST_URL_TAIL + "?object"
-);
 
 // Creates a one-shot web-channel for the test data to be sent back from the test page.
 function promiseChannelResponse(channelID, originOrPermission) {
@@ -116,15 +113,4 @@ add_task(async function () {
     got.message.errno === 2,
     "should have failed with errno 2, no such channel"
   );
-
-  // Check that the page can send an object as well if it's in the whitelist
-  let webchannelWhitelistPref = "webchannel.allowObject.urlWhitelist";
-  let origWhitelist = Services.prefs.getCharPref(webchannelWhitelistPref);
-  let newWhitelist = origWhitelist + " https://example.com";
-  Services.prefs.setCharPref(webchannelWhitelistPref, newWhitelist);
-  registerCleanupFunction(() => {
-    Services.prefs.clearUserPref(webchannelWhitelistPref);
-  });
-  got = await promiseNewChannelResponse(TEST_URI_GOOD_OBJECT);
-  Assert.ok(got.message, "should have gotten some data back");
 });

browser/base/content/test/general/test_remoteTroubleshoot.html

@@ -1,21 +1,12 @@
 <!DOCTYPE HTML>
 <html>
 <script>
-// This test is run multiple times, once with only strings allowed through the
-// WebChannel, and once with objects allowed. This function allows us to handle
-// both cases without too much pain.
-function makeDetails(object) {
-  if (window.location.search.includes("object")) {
-    return object;
-  }
-  return JSON.stringify(object);
-}
 // Add a listener for responses to our remote requests.
 window.addEventListener("WebChannelMessageToContent", function(event) {
   if (event.detail.id == "remote-troubleshooting") {
     // Send what we got back to the test.
     var backEvent = new window.CustomEvent("WebChannelMessageToChrome", {
-      detail: makeDetails({
+      detail: JSON.stringify({
         id: "test-remote-troubleshooting-backchannel",
         message: {
           message: event.detail.message,
@@ -32,7 +23,7 @@
 // Make a request for the troubleshooting data as we load.
 window.onload = function() {
   var event = new window.CustomEvent("WebChannelMessageToChrome", {
-    detail: makeDetails({
+    detail: JSON.stringify({
       id: "remote-troubleshooting",
       message: {
         command: "request",

browser/components/enterprisepolicies/Policies.sys.mjs

@@ -1864,6 +1864,7 @@ export var Policies = {
         "general.smoothScroll",
         "geo.",
         "gfx.",
+        "identity.fxaccounts.toolbar.",
         "intl.",
         "keyword.enabled",
         "layers.",

browser/components/places/tests/browser/browser_bookmark_copy_folder_tree.js

@@ -14,6 +14,33 @@ add_task(async function () {
     await PlacesUtils.bookmarks.eraseEverything();
   });
 
+  if (AppConstants.platform === "win") {
+    if (Services.env.get("MOZ_AUTOMATION")) {
+      // When running in CI, pre-emptively kill Windows Explorer, using system
+      // from the standard library, since it sometimes holds the clipboard for
+      // long periods, thereby breaking the test (bug 1921759).
+      const { ctypes } = ChromeUtils.importESModule(
+        "resource://gre/modules/ctypes.sys.mjs"
+      );
+      let libc = ctypes.open("ucrtbase.dll");
+      let exec = libc.declare(
+        "system",
+        ctypes.default_abi,
+        ctypes.int,
+        ctypes.char.ptr
+      );
+      let rv = exec(
+        '"powershell -command "&{&Stop-Process -ProcessName explorer}"'
+      );
+      libc.close();
+      is(rv, 0, "Launched powershell to stop explorer.exe");
+    } else {
+      info(
+        "Skipping terminating Windows Explorer since we are not running in automation"
+      );
+    }
+  }
+
   await withSidebarTree("bookmarks", async function (tree) {
     const selectedNodeComparator = {
       equalTitle: itemNode => {

browser/components/shopping/tests/browser/browser.toml

@@ -70,9 +70,7 @@ prefs = [
 ["browser_stale_product.js"]
 
 ["browser_ui_telemetry.js"]
-skip-if = [
-  "os == 'linux' && os_version == '18.04'"
-]
+skip-if = ["true"]
 
 ["browser_unanalyzed_product.js"]
 

browser/config/version.txt

@@ -1 +1 @@
-128.5.0
+128.7.0

browser/config/version_display.txt

@@ -1 +1 @@
-11.21.0
+11.22.0

build/moz.configure/bootstrap.configure

@@ -92,6 +92,7 @@ def bootstrap_toolchain_tasks(host):
         result = {
             "index": t.optimization["index-search"],
             "artifact": t.attributes["toolchain-artifact"],
+            "extract": t.attributes.get("toolchain-extract", True),
         }
         command = t.attributes.get("toolchain-command")
         if command:
@@ -219,6 +220,9 @@ def bootstrap_path(path, **kwargs):
                     "--from-task",
                     f"{task_id}:{artifact}",
                 ]
+                if not task["extract"]:
+                    command.append("--no-unpack")
+
             elif command:
                 # For private local toolchains, run the associated command.
                 command = (

config/milestone.txt

@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-128.5.0
+128.7.0

docshell/base/nsDocShell.cpp

@@ -6156,9 +6156,13 @@ nsresult nsDocShell::FilterStatusForErrorPage(
   if (aStatus == NS_ERROR_UNKNOWN_PROTOCOL) {
     // For unknown protocols we only display an error if the load is triggered
     // by the browser itself. Showing the error for page-triggered navigations
-    // causes annoying behavior for users, see bug 1528305.
+    // causes annoying behavior for users when a page tries to open an external
+    // app which has not been installed, see bug 1528305. A missing WebExtension
+    // protocol handlers will however always load the error page, as it is not
+    // expected to be opened externally, see bug 1921426.
     nsCOMPtr<nsILoadInfo> info = aChannel->LoadInfo();
-    if (!info->TriggeringPrincipal()->IsSystemPrincipal()) {
+    if (!info->TriggeringPrincipal()->IsSystemPrincipal() &&
+        !BasePrincipal::Cast(info->TriggeringPrincipal())->AddonPolicy()) {
       if (aSkippedUnknownProtocolNavigation) {
         *aSkippedUnknownProtocolNavigation = true;
       }

dom/base/StructuredCloneHolder.cpp

@@ -1369,14 +1369,14 @@ StructuredCloneHolder::CustomReadTransferHandler(
         static_cast<OffscreenCanvasCloneData*>(aContent);
     RefPtr<OffscreenCanvas> canvas =
         OffscreenCanvas::CreateFromCloneData(mGlobal, data);
-    delete data;
 
     JS::Rooted<JS::Value> value(aCx);
     if (!GetOrCreateDOMReflector(aCx, canvas, &value)) {
       JS_ClearPendingException(aCx);
       return false;
     }
 
+    delete data;
     aReturnObject.set(&value.toObject());
     return true;
   }
@@ -1390,14 +1390,14 @@ StructuredCloneHolder::CustomReadTransferHandler(
     ImageBitmapCloneData* data = static_cast<ImageBitmapCloneData*>(aContent);
     RefPtr<ImageBitmap> bitmap =
         ImageBitmap::CreateFromCloneData(mGlobal, data);
-    delete data;
 
     JS::Rooted<JS::Value> value(aCx);
     if (!GetOrCreateDOMReflector(aCx, bitmap, &value)) {
       JS_ClearPendingException(aCx);
       return false;
     }
 
+    delete data;
     aReturnObject.set(&value.toObject());
     return true;
   }
@@ -1466,14 +1466,14 @@ StructuredCloneHolder::CustomReadTransferHandler(
     if (!frame) {
       return false;
     }
-    delete data;
-    aContent = nullptr;
 
     JS::Rooted<JS::Value> value(aCx);
     if (!GetOrCreateDOMReflector(aCx, frame, &value)) {
       JS_ClearPendingException(aCx);
       return false;
     }
+    delete data;
+    aContent = nullptr;
     aReturnObject.set(&value.toObject());
     return true;
   }
@@ -1499,14 +1499,14 @@ StructuredCloneHolder::CustomReadTransferHandler(
     if (!audioData) {
       return false;
     }
-    delete data;
-    aContent = nullptr;
 
     JS::Rooted<JS::Value> value(aCx);
     if (!GetOrCreateDOMReflector(aCx, audioData, &value)) {
       JS_ClearPendingException(aCx);
       return false;
     }
+    delete data;
+    aContent = nullptr;
     aReturnObject.set(&value.toObject());
     return true;
   }

dom/base/nsLineBreaker.cpp

@@ -15,6 +15,7 @@
 #include "mozilla/intl/LineBreaker.h"  // for LineBreaker::ComputeBreakPositions
 #include "mozilla/intl/Locale.h"
 #include "mozilla/intl/UnicodeProperties.h"
+#include "mozilla/ScopeExit.h"
 #include "mozilla/StaticPrefs_intl.h"
 
 using mozilla::AutoRestore;
@@ -150,6 +151,15 @@ static void SetupCapitalization(const char16_t* aWord, uint32_t aLength,
 }
 
 nsresult nsLineBreaker::FlushCurrentWord() {
+  auto cleanup = mozilla::MakeScopeExit([&] {
+    mCurrentWord.Clear();
+    mTextItems.Clear();
+    mCurrentWordMightBeBreakable = false;
+    mCurrentWordContainsMixedLang = false;
+    mCurrentWordLanguage = nullptr;
+    mWordContinuation = false;
+  });
+
   uint32_t length = mCurrentWord.Length();
   AutoTArray<uint8_t, 4000> breakState;
   if (!breakState.AppendElements(length, mozilla::fallible)) {
@@ -232,12 +242,6 @@ nsresult nsLineBreaker::FlushCurrentWord() {
     offset += ti->mLength;
   }
 
-  mCurrentWord.Clear();
-  mTextItems.Clear();
-  mCurrentWordMightBeBreakable = false;
-  mCurrentWordContainsMixedLang = false;
-  mCurrentWordLanguage = nullptr;
-  mWordContinuation = false;
   return NS_OK;
 }
 

dom/canvas/DrawTargetWebgl.cpp

@@ -3048,7 +3048,12 @@ static inline AAStroke::LineCap ToAAStrokeLineCap(CapStyle aCap) {
 }
 
 static inline Point WGRPointToPoint(const WGR::Point& aPoint) {
-  return Point(IntPoint(aPoint.x, aPoint.y)) * (1.0f / 16.0f);
+  // WGR points are 28.4 fixed-point where (0.0, 0.0) is assumed to be a pixel
+  // center, as opposed to (0.5, 0.5) in canvas device space. WGR thus shifts
+  // each point by (-0.5, -0.5). To undo this, transform from fixed-point back
+  // to floating-point, and reverse the pixel shift by adding back (0.5, 0.5).
+  return Point(IntPoint(aPoint.x, aPoint.y)) * (1.0f / 16.0f) +
+         Point(0.5f, 0.5f);
 }
 
 // Generates a vertex buffer for a stroked path using aa-stroke.

dom/html/HTMLInputElement.cpp

@@ -5717,7 +5717,7 @@ Nullable<uint32_t> HTMLInputElement::GetSelectionStart(ErrorResult& aRv) {
 }
 
 uint32_t HTMLInputElement::GetSelectionStartIgnoringType(ErrorResult& aRv) {
-  uint32_t selEnd, selStart;
+  uint32_t selEnd = 0, selStart = 0;
   GetSelectionRange(&selStart, &selEnd, aRv);
   return selStart;
 }
@@ -5748,7 +5748,7 @@ Nullable<uint32_t> HTMLInputElement::GetSelectionEnd(ErrorResult& aRv) {
 }
 
 uint32_t HTMLInputElement::GetSelectionEndIgnoringType(ErrorResult& aRv) {
-  uint32_t selEnd, selStart;
+  uint32_t selEnd = 0, selStart = 0;
   GetSelectionRange(&selStart, &selEnd, aRv);
   return selEnd;
 }

dom/media/eme/mediafoundation/WMFCDMImpl.cpp

@@ -20,6 +20,7 @@ RefPtr<WMFCDMImpl::InitPromise> WMFCDMImpl::Init(
     const WMFCDMImpl::InitParams& aParams) {
   if (!mCDM) {
     mCDM = MakeRefPtr<MFCDMChild>(mKeySystem);
+    mCDM->EnsureRemote();
   }
   RefPtr<WMFCDMImpl> self = this;
   mCDM->Init(aParams.mOrigin, aParams.mInitDataTypes,
@@ -58,6 +59,7 @@ WMFCDMCapabilites::GetCapabilities(
   nsTArray<RefPtr<CapabilitiesPromise>> promises;
   for (const auto& request : aRequests) {
     RefPtr<MFCDMChild> cdm = new MFCDMChild(request.mKeySystem);
+    cdm->EnsureRemote();
     promises.AppendElement(cdm->GetCapabilities(MFCDMCapabilitiesRequest{
         nsString{request.mKeySystem},
         request.mDecryption == KeySystemConfig::DecryptionInfo::Hardware,