gh-14930: Sync upstream Firefox to version 153.0.4 (gh-14924)

README.md

@@ -34,8 +34,8 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne
 
 ### Firefox Versions
 
-- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `153.0.3`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 153.0.3`!
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `153.0.4`! 🚀
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 153.0.4`!
 
 ### Contributing
 

build/firefox-cache/l10n-last-commit-hash

@@ -1 +1 @@
-8a0a534248f80d8c53a8997f24683521c3a50ebc
+5770c902793071359ace6016706281dec48c53af

scripts/update_external_patches.py

@@ -83,7 +83,7 @@ def main():
       dest = patch.get("dest")
       if not url or not dest:
         die(f"Patch entry missing 'url' or 'dest': {patch}")
-      filename = url.split("/")[-1]
+      filename = patch.get("filename", url.split("/")[-1])
       output_file = os.path.join(OUTPUT_DIR, dest, filename)
       download_patch_from_url(url, output_file)
       replaces = patch.get("replaces", {})

src/browser/components/asrouter/modules/FeatureCallout-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/asrouter/modules/FeatureCallout.sys.mjs b/browser/components/asrouter/modules/FeatureCallout.sys.mjs
-index c4638d2d557f05fa6638cd379be8e0076336f8dc..2e25f485aa94485d12ca9e98aa4eaf56a06cf1f8 100644
+index bc989826e648e2528b4142940e1ae4d192940235..4cd18e67fbb52ea33ae6a9b0a47cbf2359d1b832 100644
 --- a/browser/components/asrouter/modules/FeatureCallout.sys.mjs
 +++ b/browser/components/asrouter/modules/FeatureCallout.sys.mjs
-@@ -778,6 +778,7 @@ export class FeatureCallout {
+@@ -809,6 +809,7 @@ export class FeatureCallout {
      ) {
        return false;
      }
@@ -10,3 +10,11 @@ index c4638d2d557f05fa6638cd379be8e0076336f8dc..2e25f485aa94485d12ca9e98aa4eaf56
  
      const style = this.win.getComputedStyle(el);
      return style?.visibility === "visible" && style?.display !== "none";
+@@ -1107,7 +1108,6 @@ export class FeatureCallout {
+             type="arrow"
+             consumeoutsideclicks="never"
+             norolluponanchor="true"
+-            nonnative=""
+             position="${panel_position.panel_position_string}"
+             ${hide_arrow ? "" : 'show-arrow=""'}
+             ${autohide ? "" : 'noautohide="true"'}

src/external-patches/manifest.json

@@ -48,5 +48,11 @@
       "D312091"
     ],
     "name": "Expose tiled attribute to all platforms"
+  },
+  {
+    "type": "patch",
+    "url": "https://gitlab.archlinux.org/archlinux/packaging/packages/firefox/-/raw/main/0002-Bug-2057577-DOM-Media-Add-FFmpeg-63-support.-r-alwu-.patch",
+    "dest": "firefox",
+    "filename": "bug-2057577-ffmpeg-63-support.patch"
   }
 ]

src/zen/boosts/ZenBoostStyles.sys.mjs

@@ -81,15 +81,8 @@ export class nsZenBoostStyles {
     }
 
     if (fontCase != "" || fontFamily != "") {
-      const ignoredElements = [
-        ".google-symbols",
-        "gf-load-icon-font",
-        "mat-icon",
-        ".google-material-icons",
-        "span",
-      ];
       style += `/* Text Format */\n`;
-      style += `body *:not(${ignoredElements.join(",")}) {\n`;
+      style += `body *:not(.google-symbols, gf-load-icon-font, mat-icon, .google-material-icons) {\n`;
       style += `${fontFamily}\n`;
       style += `${fontCase}\n`;
       style += `}\n`;

src/zen/live-folders/ZenLiveFoldersManager.sys.mjs

@@ -344,9 +344,6 @@ class nsZenLiveFoldersManager {
       },
     });
 
-    lazy.setTimeout(() => {
-      callout.endTour();
-    }, 10000);
   }
 
   deleteFolder(id, deleteFolder = true) {

src/zen/sessionstore/ZenWindowSync.sys.mjs

@@ -1373,6 +1373,7 @@ class nsZenWindowSync {
       const newTab = win.gBrowser.addTrustedTab("about:blank", {
         animate: true,
         createLazyBrowser: true,
+        userContextId: tab.userContextId,
         _forZenEmptyTab: tab.hasAttribute("zen-empty-tab"),
       });
       newTab.id = tab.id;

src/zen/tests/window_sync/browser_sync_tab_open.js

@@ -16,3 +16,41 @@ add_task(async function test_SimpleTabOpen() {
     );
   });
 });
+
+add_task(async function test_TabOpenInContainer() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["privacy.userContext.enabled", true]],
+  });
+  let newTab = null;
+  await withNewSyncedWindow(async win => {
+    await runSyncAction(
+      () => {
+        newTab = gBrowser.addTrustedTab("https://example.com/", {
+          inBackground: true,
+          userContextId: 1,
+        });
+      },
+      async () => {
+        Assert.equal(
+          newTab.userContextId,
+          1,
+          "The opened tab should keep its container"
+        );
+        const otherTab = gZenWindowSync.getItemFromWindow(win, newTab.id);
+        Assert.ok(
+          otherTab,
+          "The opened tab should be found in the synced window"
+        );
+        Assert.equal(
+          otherTab.userContextId,
+          newTab.userContextId,
+          "The synced tab should inherit the original tab's container"
+        );
+      },
+      "TabOpen"
+    );
+  });
+  let tabClosing = BrowserTestUtils.waitForTabClosing(newTab);
+  BrowserTestUtils.removeTab(newTab);
+  await tabClosing;
+});

surfer.json

@@ -5,8 +5,8 @@
   "binaryName": "zen",
   "version": {
     "product": "firefox",
-    "version": "153.0.3",
-    "candidate": "153.0.3",
+    "version": "153.0.4",
+    "candidate": "153.0.4",
     "candidateBuild": 1
   },
   "buildOptions": {
@@ -20,7 +20,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.21.13b",
+        "displayVersion": "1.21.14b",
         "github": {
           "repo": "zen-browser/desktop"
         },