Discard changes to src/browser/components/sessionstore/SessionStore-sys-mjs.patch

This commit is contained in:
mr. m 2025-04-30 18:31:08 +02:00 committed by GitHub
parent e7c3631a71
commit 494c8fe599
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1,5 +1,5 @@
diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
index 5633e5032f5d50c70512187d27e045b579978927..95a903916f89003486567c37f6a7cc303de496d9 100644
index 5633e5032f5d50c70512187d27e045b579978927..dd7aa4827eaa809dadc7e1fe6cdd1083e79f383a 100644
--- a/browser/components/sessionstore/SessionStore.sys.mjs
+++ b/browser/components/sessionstore/SessionStore.sys.mjs
@@ -3202,7 +3202,7 @@ var SessionStoreInternal = {
@ -11,18 +11,17 @@ index 5633e5032f5d50c70512187d27e045b579978927..95a903916f89003486567c37f6a7cc30
return;
}
@@ -3911,6 +3911,10 @@ var SessionStoreInternal = {
@@ -3911,6 +3911,9 @@ var SessionStoreInternal = {
Math.min(tabState.index, tabState.entries.length)
);
tabState.pinned = false;
+ tabState.zenEssential = false;
+ tabState.zenPinnedId = null;
+ tabState.zenHasStaticLabel = false;
+ tabState.zenTabId = null;
if (inBackground === false) {
aWindow.gBrowser.selectedTab = newTab;
@@ -5416,14 +5420,15 @@ var SessionStoreInternal = {
@@ -5416,14 +5419,15 @@ var SessionStoreInternal = {
}
let tabbrowser = aWindow.gBrowser;
@ -40,7 +39,7 @@ index 5633e5032f5d50c70512187d27e045b579978927..95a903916f89003486567c37f6a7cc30
continue;
}
let tabData = lazy.TabState.collect(tab, TAB_CUSTOM_VALUES.get(tab));
@@ -5442,7 +5447,7 @@ var SessionStoreInternal = {
@@ -5442,7 +5446,7 @@ var SessionStoreInternal = {
// We don't store the Firefox View tab in Session Store, so if it was the last selected "tab" when
// 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).
@ -49,7 +48,7 @@ index 5633e5032f5d50c70512187d27e045b579978927..95a903916f89003486567c37f6a7cc30
selectedIndex = 1;
winData.title = tabbrowser.tabs[0].label;
}
@@ -5599,6 +5604,7 @@ var SessionStoreInternal = {
@@ -5599,6 +5603,7 @@ var SessionStoreInternal = {
winData.tabs,
winData.groups ?? []
);
@ -57,7 +56,7 @@ index 5633e5032f5d50c70512187d27e045b579978927..95a903916f89003486567c37f6a7cc30
this._log.debug(
`restoreWindow, createTabsForSessionRestore returned ${tabs.length} tabs`
);
@@ -6148,8 +6154,26 @@ var SessionStoreInternal = {
@@ -6148,8 +6153,23 @@ var SessionStoreInternal = {
// Most of tabData has been restored, now continue with restoring
// attributes that may trigger external events.
@ -70,9 +69,6 @@ index 5633e5032f5d50c70512187d27e045b579978927..95a903916f89003486567c37f6a7cc30
+ if (tabData.zenHasStaticLabel) {
+ tab.setAttribute("zen-has-static-label", "true");
+ }
+ if (tabData.zenTabId) {
+ tab.setAttribute("zen-tab-id", tabData.zenTabId);
+ }
+ if (tabData.zenPinnedId) {
+ tab.setAttribute("zen-pin-id", tabData.zenPinnedId);
+ }