diff --git a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch index f354ceada..bab8fea24 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 2c2f43bf743ef458b378e85e9ed44a971711e1d9..450316b7e18852cc088479e9a5fb5832cee88ace 100644 +index 2c2f43bf743ef458b378e85e9ed44a971711e1d9..6894412f5dcf632c1d4c3dabeffabf9e5dd96222 100644 --- a/browser/components/sessionstore/SessionStore.sys.mjs +++ b/browser/components/sessionstore/SessionStore.sys.mjs @@ -127,6 +127,8 @@ const TAB_EVENTS = [ @@ -11,15 +11,7 @@ index 2c2f43bf743ef458b378e85e9ed44a971711e1d9..450316b7e18852cc088479e9a5fb5832 ]; const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; -@@ -196,6 +198,7 @@ ChromeUtils.defineESModuleGetters(lazy, { - TabStateCache: "resource:///modules/sessionstore/TabStateCache.sys.mjs", - TabStateFlusher: "resource:///modules/sessionstore/TabStateFlusher.sys.mjs", - setTimeout: "resource://gre/modules/Timer.sys.mjs", -+ ZenSessionStore: "resource:///modules/zen/ZenSessionManager.sys.mjs", - }); - - ChromeUtils.defineLazyGetter(lazy, "blankURI", () => { -@@ -1911,6 +1914,8 @@ var SessionStoreInternal = { +@@ -1911,6 +1913,8 @@ var SessionStoreInternal = { case "TabPinned": case "TabUnpinned": case "SwapDocShells": @@ -28,68 +20,19 @@ index 2c2f43bf743ef458b378e85e9ed44a971711e1d9..450316b7e18852cc088479e9a5fb5832 this.saveStateDelayed(win); break; case "TabGroupCreate": -@@ -2020,6 +2025,10 @@ var SessionStoreInternal = { - this._windows[aWindow.__SSi].isTaskbarTab = true; - } - -+ if (aWindow.document.documentElement.hasAttribute("zen-unsynced-window")) { -+ this._windows[aWindow.__SSi].isZenUnsynced = true; -+ } -+ - let tabbrowser = aWindow.gBrowser; - - // add tab change listeners to all already existing tabs -@@ -2151,7 +2160,6 @@ var SessionStoreInternal = { - if (closedWindowState) { - let newWindowState; - if ( -- AppConstants.platform == "macosx" || - !lazy.SessionStartup.willRestore() - ) { - // We want to split the window up into pinned tabs and unpinned tabs. -@@ -2215,6 +2223,15 @@ var SessionStoreInternal = { - }); - this._shouldRestoreLastSession = false; - } -+ else if (!aInitialState && isRegularWindow) { -+ let windowPromises = []; -+ for (let window of this._browserWindows) { -+ windowPromises.push(lazy.TabStateFlusher.flushWindow(window)); -+ } -+ Promise.all(windowPromises).finally(() => { -+ lazy.ZenSessionStore.restoreNewWindow(aWindow, this); -+ }); -+ } - - if (this._restoreLastWindow && aWindow.toolbar.visible) { - // always reset (if not a popup window) -@@ -2465,7 +2482,7 @@ var SessionStoreInternal = { - // 2) Flush the window. - // 3) When the flush is complete, revisit our decision to store the window - // in _closedWindows, and add/remove as necessary. -- if (!winData.isPrivate && !winData.isTaskbarTab) { -+ if (!winData.isPrivate && !winData.isTaskbarTab && !winData.isZenUnsynced) { - this.maybeSaveClosedWindow(winData, isLastWindow); +@@ -2384,11 +2388,9 @@ var SessionStoreInternal = { + tabbrowser.selectedTab.label; } -@@ -2486,7 +2503,7 @@ var SessionStoreInternal = { +- if (AppConstants.platform != "macosx") { + // Until we decide otherwise elsewhere, this window is part of a series + // of closing windows to quit. + winData._shouldRestore = true; +- } - // Save non-private windows if they have at - // least one saveable tab or are the last window. -- if (!winData.isPrivate && !winData.isTaskbarTab) { -+ if (!winData.isPrivate && !winData.isTaskbarTab && !winData.isZenUnsynced) { - this.maybeSaveClosedWindow(winData, isLastWindow); - - if (!isLastWindow && winData.closedId > -1) { -@@ -2582,6 +2599,7 @@ 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, isLastWindow); - - if (shouldStore && !alreadyStored) { - let index = this._closedWindows.findIndex(win => { -@@ -3373,7 +3391,7 @@ var SessionStoreInternal = { + // Store the window's close date to figure out when each individual tab + // was closed. This timestamp should allow re-arranging data based on how +@@ -3373,7 +3375,7 @@ var SessionStoreInternal = { if (!isPrivateWindow && tabState.isPrivate) { return; } @@ -98,12 +41,12 @@ index 2c2f43bf743ef458b378e85e9ed44a971711e1d9..450316b7e18852cc088479e9a5fb5832 return; } -@@ -4089,6 +4107,12 @@ var SessionStoreInternal = { +@@ -4089,6 +4091,12 @@ var SessionStoreInternal = { Math.min(tabState.index, tabState.entries.length) ); tabState.pinned = false; + tabState.zenEssential = false; -+ tabState.zenSyncId = null; ++ tabState.zenPinnedId = null; + tabState.zenIsGlance = false; + tabState.zenGlanceId = null; + tabState.zenHasStaticLabel = false; @@ -111,7 +54,7 @@ index 2c2f43bf743ef458b378e85e9ed44a971711e1d9..450316b7e18852cc088479e9a5fb5832 if (inBackground === false) { aWindow.gBrowser.selectedTab = newTab; -@@ -4525,6 +4549,7 @@ var SessionStoreInternal = { +@@ -4525,6 +4533,7 @@ var SessionStoreInternal = { // Append the tab if we're opening into a different window, tabIndex: aSource == aTargetWindow ? pos : Infinity, pinned: state.pinned, @@ -119,7 +62,7 @@ index 2c2f43bf743ef458b378e85e9ed44a971711e1d9..450316b7e18852cc088479e9a5fb5832 userContextId: state.userContextId, skipLoad: true, preferredRemoteType, -@@ -5374,7 +5399,7 @@ var SessionStoreInternal = { +@@ -5374,7 +5383,7 @@ var SessionStoreInternal = { for (let i = tabbrowser.pinnedTabCount; i < tabbrowser.tabs.length; i++) { let tab = tabbrowser.tabs[i]; @@ -128,16 +71,16 @@ index 2c2f43bf743ef458b378e85e9ed44a971711e1d9..450316b7e18852cc088479e9a5fb5832 removableTabs.push(tab); } } -@@ -5483,7 +5508,7 @@ var SessionStoreInternal = { +@@ -5434,7 +5443,7 @@ var SessionStoreInternal = { + } - // collect the data for all windows - for (ix in this._windows) { -- if (this._windows[ix]._restoring || this._windows[ix].isTaskbarTab) { -+ if (this._windows[ix]._restoring || this._windows[ix].isTaskbarTab && !this._windows[ix].isZenUnsynced) { - // window data is still in _statesToRestore - continue; - } -@@ -5625,11 +5650,12 @@ var SessionStoreInternal = { + let workspaceID = aWindow.getWorkspaceID(); +- if (workspaceID) { ++ if (workspaceID && !(this.isLastRestorableWindow() && AppConstants.platform == "macosx")) { + winData.workspaceID = workspaceID; + } + }, +@@ -5625,11 +5634,12 @@ var SessionStoreInternal = { } let tabbrowser = aWindow.gBrowser; @@ -151,17 +94,15 @@ index 2c2f43bf743ef458b378e85e9ed44a971711e1d9..450316b7e18852cc088479e9a5fb5832 // update the internal state data for this window for (let tab of tabs) { if (tab == aWindow.FirefoxViewHandler.tab) { -@@ -5640,6 +5666,9 @@ var SessionStoreInternal = { +@@ -5640,6 +5650,7 @@ var SessionStoreInternal = { tabsData.push(tabData); } + winData.folders = aWindow.gZenFolders?.storeDataForSessionStore() || []; -+ winData.activeZenSpace = aWindow.gZenWorkspaces?.activeWorkspace || null; -+ winData.spaces = aWindow.gZenWorkspaces?.getWorkspaces(); // update tab group state for this window winData.groups = []; for (let tabGroup of aWindow.gBrowser.tabGroups) { -@@ -5652,7 +5681,7 @@ var SessionStoreInternal = { +@@ -5652,7 +5663,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) { @@ -170,7 +111,7 @@ index 2c2f43bf743ef458b378e85e9ed44a971711e1d9..450316b7e18852cc088479e9a5fb5832 winData.title = tabbrowser.tabs[0].label; } winData.selected = selectedIndex; -@@ -5765,8 +5794,8 @@ var SessionStoreInternal = { +@@ -5765,8 +5776,8 @@ var SessionStoreInternal = { // selectTab represents. let selectTab = 0; if (overwriteTabs) { @@ -181,7 +122,7 @@ index 2c2f43bf743ef458b378e85e9ed44a971711e1d9..450316b7e18852cc088479e9a5fb5832 selectTab = Math.min(selectTab, winData.tabs.length); } -@@ -5788,6 +5817,7 @@ var SessionStoreInternal = { +@@ -5788,6 +5799,7 @@ var SessionStoreInternal = { if (overwriteTabs) { for (let i = tabbrowser.browsers.length - 1; i >= 0; i--) { if (!tabbrowser.tabs[i].selected) { @@ -189,17 +130,16 @@ index 2c2f43bf743ef458b378e85e9ed44a971711e1d9..450316b7e18852cc088479e9a5fb5832 tabbrowser.removeTab(tabbrowser.tabs[i]); } } -@@ -5821,6 +5851,9 @@ var SessionStoreInternal = { - savedTabGroup => !openTabGroupIdsInWindow.has(savedTabGroup.id) +@@ -5809,6 +5821,8 @@ var SessionStoreInternal = { + winData.tabs, + winData.groups ?? [] ); - } -+ aWindow.gZenFolders?.restoreDataFromSessionStore(winData.folders); -+ aWindow.gZenViewSplitter?.restoreDataFromSessionStore(winData.splitViewData); -+ aWindow.gZenWorkspaces?.restoreWorkspacesFromSessionStore(winData); - - // Move the originally open tabs to the end. - if (initialTabs) { -@@ -6372,6 +6405,25 @@ var SessionStoreInternal = { ++ aWindow.gZenFolders?.restoreDataFromSessionStore(winData.folders); ++ aWindow.gZenViewSplitter?.restoreDataFromSessionStore(winData.splitViewData); + this._log.debug( + `restoreWindow, createTabsForSessionRestore returned ${tabs.length} tabs` + ); +@@ -6372,6 +6386,25 @@ var SessionStoreInternal = { // Most of tabData has been restored, now continue with restoring // attributes that may trigger external events. @@ -213,8 +153,8 @@ index 2c2f43bf743ef458b378e85e9ed44a971711e1d9..450316b7e18852cc088479e9a5fb5832 + if (tabData.zenHasStaticLabel) { + tab.setAttribute("zen-has-static-label", "true"); + } -+ if (tabData.zenSyncId) { -+ tab.setAttribute("id", tabData.zenSyncId); ++ if (tabData.zenPinnedId) { ++ tab.setAttribute("zen-pin-id", tabData.zenPinnedId); + } + if (tabData.zenDefaultUserContextId) { + tab.setAttribute("zenDefaultUserContextId", true); @@ -225,7 +165,7 @@ index 2c2f43bf743ef458b378e85e9ed44a971711e1d9..450316b7e18852cc088479e9a5fb5832 if (tabData.pinned) { tabbrowser.pinTab(tab); -@@ -7290,7 +7342,7 @@ var SessionStoreInternal = { +@@ -7290,7 +7323,7 @@ var SessionStoreInternal = { let groupsToSave = new Map(); for (let tIndex = 0; tIndex < window.tabs.length; ) { @@ -234,7 +174,7 @@ index 2c2f43bf743ef458b378e85e9ed44a971711e1d9..450316b7e18852cc088479e9a5fb5832 // Adjust window.selected if (tIndex + 1 < window.selected) { window.selected -= 1; -@@ -7305,7 +7357,7 @@ var SessionStoreInternal = { +@@ -7305,7 +7338,7 @@ var SessionStoreInternal = { ); // We don't want to increment tIndex here. continue;