From 481163a7560c0f1245399bb62f39a137d260e1c6 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com>
Date: Tue, 6 Jan 2026 12:38:22 +0100
Subject: [PATCH] feat: Correctly initialize new restored windows, p=#11821

* feat: Correctly initialize new restored windows, b=no-bug, c=no-component

* chore: Experiment with different build flags for optimization and build time, b=no-bug, c=common, configs

* chore: Format, b=no-bug, c=no-component
---
 configs/common/mozconfig                   | 6 ------
 configs/macos/mozconfig                    | 4 ++--
 src/zen/sessionstore/ZenWindowSync.sys.mjs | 6 +-----
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index 952c6c67b..ae3c43b4c 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -79,12 +79,6 @@ if test "$ZEN_RELEASE"; then
   MOZILLA_OFFICIAL=1
   export MOZILLA_OFFICIAL=1
 
-  export OPT_LEVEL="3"
-  ac_add_options OPT_LEVEL="3"
-
-  export RUSTC_OPT_LEVEL="3"
-  ac_add_options RUSTC_OPT_LEVEL="3"
-
   mk_add_options AUTOCLOBBER=1
   export AUTOCLOBBER=1
 
diff --git a/configs/macos/mozconfig b/configs/macos/mozconfig
index 036b93fe0..83d2966c2 100644
--- a/configs/macos/mozconfig
+++ b/configs/macos/mozconfig
@@ -28,14 +28,14 @@ if test "$SURFER_COMPAT" = "x86_64"; then
 
   if test "$ZEN_RELEASE"; then
     ac_add_options --enable-wasm-avx
-    ac_add_options --enable-optimize="-march=nehalem -mtune=haswell -O3 -w"
+    ac_add_options --enable-optimize="-march=nehalem -mtune=haswell -O2 -w"
   fi
 else
   ac_add_options --enable-clang-plugin
   ac_add_options --target=aarch64-apple-darwin
 
   if test "$ZEN_RELEASE"; then
-    ac_add_options --enable-optimize="-O3 -mcpu=apple-m1"
+    ac_add_options --enable-optimize="-O2 -mcpu=apple-m1"
 
     # As of Clang 13, the default is -mcpu=apple-m1 when using a aarch64-apple-macos target,
     # but we're using apple64-apple-darwin, which defaults to -mcpu=apple-a7, which disables
diff --git a/src/zen/sessionstore/ZenWindowSync.sys.mjs b/src/zen/sessionstore/ZenWindowSync.sys.mjs
index 64bfa233a..659e66117 100644
--- a/src/zen/sessionstore/ZenWindowSync.sys.mjs
+++ b/src/zen/sessionstore/ZenWindowSync.sys.mjs
@@ -96,11 +96,7 @@ class nsZenWindowSync {
   #browserWindows = {
     *[Symbol.iterator]() {
       for (let window of lazy.BrowserWindowTracker.orderedWindows) {
-        if (
-          window.__SSi &&
-          !window.closed &&
-          !window.gZenWorkspaces?.privateWindowOrDisabled
-        ) {
+        if (window.__SSi && !window.closed && !window.gZenWorkspaces?.privateWindowOrDisabled) {
           yield window;
         }
       }