From 7af6cae278f044aa7ba34ac85d193da99db355e6 Mon Sep 17 00:00:00 2001 From: "Mr. M" Date: Wed, 21 Jan 2026 18:20:51 +0100 Subject: [PATCH] feat: Make sure to always store closed window data, b=no-bug, c=no-component --- .../sessionstore/SessionStore-sys-mjs.patch | 46 ++++++++++--------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch index 41f1f119a..191ceef51 100644 --- a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch +++ b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs -index 2a055f0c5f34f0a2667f659185120c07d38f4e41..6b05f51e4731af3d1fc96b257fa0d35582182e4b 100644 +index 2a055f0c5f34f0a2667f659185120c07d38f4e41..6f956ceeadd17afa0bc55355cd97e4e5549dd4dd 100644 --- a/browser/components/sessionstore/SessionStore.sys.mjs +++ b/browser/components/sessionstore/SessionStore.sys.mjs @@ -127,6 +127,9 @@ const TAB_EVENTS = [ @@ -124,36 +124,40 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..6b05f51e4731af3d1fc96b257fa0d355 } completionPromise = lazy.TabStateFlusher.flushWindow(aWindow).then(() => { -@@ -2512,7 +2530,8 @@ var SessionStoreInternal = { +@@ -2512,8 +2530,9 @@ var SessionStoreInternal = { // Save non-private windows if they have at // least one saveable tab or are the last window. - if (!winData.isPrivate && !winData.isTaskbarTab) { +- this.maybeSaveClosedWindow(winData, isLastWindow); + lazy.ZenWindowSync.on_WindowCloseAndBrowserFlushed(browsers); + if (!winData.isPrivate && !winData.isTaskbarTab && !winData.isZenUnsynced) { - this.maybeSaveClosedWindow(winData, isLastWindow); ++ this.maybeSaveClosedWindow(winData, isLastWindow, isLastRegularWindow); if (!isLastWindow && winData.closedId > -1) { -@@ -2589,7 +2608,7 @@ var SessionStoreInternal = { + this._addClosedAction( +@@ -2589,7 +2608,10 @@ var SessionStoreInternal = { * to call this method again asynchronously (for example, after * a window flush). */ - maybeSaveClosedWindow(winData, isLastWindow) { + maybeSaveClosedWindow(winData, isLastWindow, isLastRegularWindow = false) { ++ if (this._saveableClosedWindowData.has(winData)) { ++ lazy.ZenSessionStore.maybeSaveClosedWindow(winData, isLastRegularWindow); ++ } // Make sure SessionStore is still running, and make sure that we // haven't chosen to forget this window. if ( -@@ -2608,6 +2627,9 @@ var SessionStoreInternal = { +@@ -2608,6 +2630,8 @@ var SessionStoreInternal = { let alreadyStored = winIndex != -1; // If sidebar command is truthy, i.e. sidebar is open, store sidebar settings let shouldStore = hasSaveableTabs || isLastWindow; -+ lazy.ZenSessionStore.maybeSaveClosedWindow(winData, isLastRegularWindow); + // TODO: Do we want to store closed Zen windows? All of them are synced anyways + shouldStore = false; if (shouldStore && !alreadyStored) { let index = this._closedWindows.findIndex(win => { -@@ -3408,7 +3430,7 @@ var SessionStoreInternal = { +@@ -3408,7 +3432,7 @@ var SessionStoreInternal = { if (!isPrivateWindow && tabState.isPrivate) { return; } @@ -162,7 +166,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..6b05f51e4731af3d1fc96b257fa0d355 return; } -@@ -4129,6 +4151,12 @@ var SessionStoreInternal = { +@@ -4129,6 +4153,12 @@ var SessionStoreInternal = { Math.min(tabState.index, tabState.entries.length) ); tabState.pinned = false; @@ -175,7 +179,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..6b05f51e4731af3d1fc96b257fa0d355 if (inBackground === false) { aWindow.gBrowser.selectedTab = newTab; -@@ -4565,6 +4593,8 @@ var SessionStoreInternal = { +@@ -4565,6 +4595,8 @@ var SessionStoreInternal = { // Append the tab if we're opening into a different window, tabIndex: aSource == aTargetWindow ? pos : Infinity, pinned: state.pinned, @@ -184,7 +188,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..6b05f51e4731af3d1fc96b257fa0d355 userContextId: state.userContextId, skipLoad: true, preferredRemoteType, -@@ -5414,7 +5444,7 @@ var SessionStoreInternal = { +@@ -5414,7 +5446,7 @@ var SessionStoreInternal = { for (let i = tabbrowser.pinnedTabCount; i < tabbrowser.tabs.length; i++) { let tab = tabbrowser.tabs[i]; @@ -193,7 +197,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..6b05f51e4731af3d1fc96b257fa0d355 removableTabs.push(tab); } } -@@ -5525,7 +5555,7 @@ var SessionStoreInternal = { +@@ -5525,7 +5557,7 @@ var SessionStoreInternal = { // collect the data for all windows for (ix in this._windows) { @@ -202,7 +206,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..6b05f51e4731af3d1fc96b257fa0d355 // window data is still in _statesToRestore continue; } -@@ -5668,11 +5698,12 @@ var SessionStoreInternal = { +@@ -5668,11 +5700,12 @@ var SessionStoreInternal = { } let tabbrowser = aWindow.gBrowser; @@ -216,7 +220,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..6b05f51e4731af3d1fc96b257fa0d355 // update the internal state data for this window for (let tab of tabs) { if (tab == aWindow.FirefoxViewHandler.tab) { -@@ -5683,6 +5714,9 @@ var SessionStoreInternal = { +@@ -5683,6 +5716,9 @@ var SessionStoreInternal = { tabsData.push(tabData); } @@ -226,7 +230,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..6b05f51e4731af3d1fc96b257fa0d355 // update tab group state for this window winData.groups = []; for (let tabGroup of aWindow.gBrowser.tabGroups) { -@@ -5695,7 +5729,7 @@ var SessionStoreInternal = { +@@ -5695,7 +5731,7 @@ var SessionStoreInternal = { // a window is closed, point to the first item in the tab strip instead (it will never be the Firefox View tab, // since it's only inserted into the tab strip after it's selected). if (aWindow.FirefoxViewHandler.tab?.selected) { @@ -235,7 +239,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..6b05f51e4731af3d1fc96b257fa0d355 winData.title = tabbrowser.tabs[0].label; } winData.selected = selectedIndex; -@@ -5810,8 +5844,8 @@ var SessionStoreInternal = { +@@ -5810,8 +5846,8 @@ var SessionStoreInternal = { // selectTab represents. let selectTab = 0; if (overwriteTabs) { @@ -246,7 +250,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..6b05f51e4731af3d1fc96b257fa0d355 selectTab = Math.min(selectTab, winData.tabs.length); } -@@ -5833,6 +5867,7 @@ var SessionStoreInternal = { +@@ -5833,6 +5869,7 @@ var SessionStoreInternal = { if (overwriteTabs) { for (let i = tabbrowser.browsers.length - 1; i >= 0; i--) { if (!tabbrowser.tabs[i].selected) { @@ -254,7 +258,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..6b05f51e4731af3d1fc96b257fa0d355 tabbrowser.removeTab(tabbrowser.tabs[i]); } } -@@ -5866,6 +5901,12 @@ var SessionStoreInternal = { +@@ -5866,6 +5903,12 @@ var SessionStoreInternal = { savedTabGroup => !openTabGroupIdsInWindow.has(savedTabGroup.id) ); } @@ -267,7 +271,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..6b05f51e4731af3d1fc96b257fa0d355 // Move the originally open tabs to the end. if (initialTabs) { -@@ -6419,6 +6460,25 @@ var SessionStoreInternal = { +@@ -6419,6 +6462,25 @@ var SessionStoreInternal = { // Most of tabData has been restored, now continue with restoring // attributes that may trigger external events. @@ -293,7 +297,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..6b05f51e4731af3d1fc96b257fa0d355 if (tabData.pinned) { tabbrowser.pinTab(tab); -@@ -6567,6 +6627,9 @@ var SessionStoreInternal = { +@@ -6567,6 +6629,9 @@ var SessionStoreInternal = { aWindow.gURLBar.readOnly = false; } } @@ -303,7 +307,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..6b05f51e4731af3d1fc96b257fa0d355 let promiseParts = Promise.withResolvers(); aWindow.setTimeout(() => { -@@ -7343,7 +7406,7 @@ var SessionStoreInternal = { +@@ -7343,7 +7408,7 @@ var SessionStoreInternal = { let groupsToSave = new Map(); for (let tIndex = 0; tIndex < window.tabs.length; ) { @@ -312,7 +316,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..6b05f51e4731af3d1fc96b257fa0d355 // Adjust window.selected if (tIndex + 1 < window.selected) { window.selected -= 1; -@@ -7358,7 +7421,7 @@ var SessionStoreInternal = { +@@ -7358,7 +7423,7 @@ var SessionStoreInternal = { ); // We don't want to increment tIndex here. continue;