1
1
diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
2
- index 8c6047e1ada5a22e57e1e665965237c9e22641d7..8d0585e738a5a758ebbddfa0787c71d634dadd4d 100644
2
+ index 8c6047e1ada5a22e57e1e665965237c9e22641d7..16b171c56081759e81d3efa6c0c7840fbd7902ff 100644
3
3
--- a/browser/components/sessionstore/SessionStore.sys.mjs
4
4
+++ b/browser/components/sessionstore/SessionStore.sys.mjs
5
5
@@ -2088,7 +2088,6 @@ var SessionStoreInternal = {
@@ -43,7 +43,15 @@ index 8c6047e1ada5a22e57e1e665965237c9e22641d7..8d0585e738a5a758ebbddfa0787c71d6
43
43
44
44
if (inBackground === false) {
45
45
aWindow.gBrowser.selectedTab = newTab;
46
- @@ -5239,7 +5241,7 @@ var SessionStoreInternal = {
46
+ @@ -4361,6 +4363,7 @@ var SessionStoreInternal = {
47
+ // Append the tab if we're opening into a different window,
48
+ index: aSource == aTargetWindow ? pos : Infinity,
49
+ pinned: state.pinned,
50
+ + essential: state.zenEssential,
51
+ userContextId: state.userContextId,
52
+ skipLoad: true,
53
+ preferredRemoteType,
54
+ @@ -5239,7 +5242,7 @@ var SessionStoreInternal = {
47
55
}
48
56
49
57
let workspaceID = aWindow.getWorkspaceID();
@@ -52,7 +60,7 @@ index 8c6047e1ada5a22e57e1e665965237c9e22641d7..8d0585e738a5a758ebbddfa0787c71d6
52
60
winData.workspaceID = workspaceID;
53
61
}
54
62
},
55
- @@ -5430,14 +5432 ,15 @@ var SessionStoreInternal = {
63
+ @@ -5430,14 +5433 ,15 @@ var SessionStoreInternal = {
56
64
}
57
65
58
66
let tabbrowser = aWindow.gBrowser;
@@ -70,7 +78,7 @@ index 8c6047e1ada5a22e57e1e665965237c9e22641d7..8d0585e738a5a758ebbddfa0787c71d6
70
78
continue;
71
79
}
72
80
let tabData = lazy.TabState.collect(tab, TAB_CUSTOM_VALUES.get(tab));
73
- @@ -5456,8 +5459 ,8 @@ var SessionStoreInternal = {
81
+ @@ -5456,8 +5460 ,8 @@ var SessionStoreInternal = {
74
82
// We don't store the Firefox View tab in Session Store, so if it was the last selected "tab" when
75
83
// a window is closed, point to the first item in the tab strip instead (it will never be the Firefox View tab,
76
84
// since it's only inserted into the tab strip after it's selected).
@@ -81,7 +89,7 @@ index 8c6047e1ada5a22e57e1e665965237c9e22641d7..8d0585e738a5a758ebbddfa0787c71d6
81
89
winData.title = tabbrowser.tabs[0].label;
82
90
}
83
91
winData.selected = selectedIndex;
84
- @@ -5569,8 +5572 ,8 @@ var SessionStoreInternal = {
92
+ @@ -5569,8 +5573 ,8 @@ var SessionStoreInternal = {
85
93
// selectTab represents.
86
94
let selectTab = 0;
87
95
if (overwriteTabs) {
@@ -92,15 +100,15 @@ index 8c6047e1ada5a22e57e1e665965237c9e22641d7..8d0585e738a5a758ebbddfa0787c71d6
92
100
selectTab = Math.min(selectTab, winData.tabs.length);
93
101
}
94
102
95
- @@ -5613,6 +5616 ,7 @@ var SessionStoreInternal = {
103
+ @@ -5613,6 +5617 ,7 @@ var SessionStoreInternal = {
96
104
winData.tabs,
97
105
winData.groups ?? []
98
106
);
99
107
+ aWindow.gZenViewSplitter?.restoreDataFromSessionStore(winData.splitViewData);
100
108
this._log.debug(
101
109
`restoreWindow, createTabsForSessionRestore returned ${tabs.length} tabs`
102
110
);
103
- @@ -6162,6 +6166 ,22 @@ var SessionStoreInternal = {
111
+ @@ -6162,6 +6167 ,22 @@ var SessionStoreInternal = {
104
112
105
113
// Most of tabData has been restored, now continue with restoring
106
114
// attributes that may trigger external events.
0 commit comments