mirror of
https://github.com/zen-browser/desktop.git
synced 2025-10-05 01:16:35 +00:00
chore: Update to Firefox 143.0
, c=l10n, common (#10304)
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
|
||||
index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c292756c3 100644
|
||||
index e8192ea9d8d35165fbfbb8c4fc4a96641a80cc86..fcd331a25a34e406e8f74d15db8567f79bdefd9e 100644
|
||||
--- a/browser/components/sessionstore/SessionStore.sys.mjs
|
||||
+++ b/browser/components/sessionstore/SessionStore.sys.mjs
|
||||
@@ -2135,7 +2135,6 @@ var SessionStoreInternal = {
|
||||
@@ -2133,7 +2133,6 @@ var SessionStoreInternal = {
|
||||
if (closedWindowState) {
|
||||
let newWindowState;
|
||||
if (
|
||||
@@ -10,7 +10,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
|
||||
!lazy.SessionStartup.willRestore()
|
||||
) {
|
||||
// We want to split the window up into pinned tabs and unpinned tabs.
|
||||
@@ -2368,11 +2367,9 @@ var SessionStoreInternal = {
|
||||
@@ -2366,11 +2365,9 @@ var SessionStoreInternal = {
|
||||
tabbrowser.selectedTab.label;
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
|
||||
|
||||
// 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
|
||||
@@ -3357,7 +3354,7 @@ var SessionStoreInternal = {
|
||||
@@ -3355,7 +3352,7 @@ var SessionStoreInternal = {
|
||||
if (!isPrivateWindow && tabState.isPrivate) {
|
||||
return;
|
||||
}
|
||||
@@ -31,7 +31,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -4069,6 +4066,11 @@ var SessionStoreInternal = {
|
||||
@@ -4067,6 +4064,11 @@ var SessionStoreInternal = {
|
||||
Math.min(tabState.index, tabState.entries.length)
|
||||
);
|
||||
tabState.pinned = false;
|
||||
@@ -43,7 +43,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
|
||||
|
||||
if (inBackground === false) {
|
||||
aWindow.gBrowser.selectedTab = newTab;
|
||||
@@ -4505,6 +4507,7 @@ var SessionStoreInternal = {
|
||||
@@ -4503,6 +4505,7 @@ var SessionStoreInternal = {
|
||||
// Append the tab if we're opening into a different window,
|
||||
tabIndex: aSource == aTargetWindow ? pos : Infinity,
|
||||
pinned: state.pinned,
|
||||
@@ -51,7 +51,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
|
||||
userContextId: state.userContextId,
|
||||
skipLoad: true,
|
||||
preferredRemoteType,
|
||||
@@ -5360,7 +5363,7 @@ var SessionStoreInternal = {
|
||||
@@ -5358,7 +5361,7 @@ var SessionStoreInternal = {
|
||||
|
||||
for (let i = tabbrowser.pinnedTabCount; i < tabbrowser.tabs.length; i++) {
|
||||
let tab = tabbrowser.tabs[i];
|
||||
@@ -60,7 +60,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
|
||||
removableTabs.push(tab);
|
||||
}
|
||||
}
|
||||
@@ -5420,7 +5423,7 @@ var SessionStoreInternal = {
|
||||
@@ -5418,7 +5421,7 @@ var SessionStoreInternal = {
|
||||
}
|
||||
|
||||
let workspaceID = aWindow.getWorkspaceID();
|
||||
@@ -69,7 +69,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
|
||||
winData.workspaceID = workspaceID;
|
||||
}
|
||||
},
|
||||
@@ -5611,11 +5614,12 @@ var SessionStoreInternal = {
|
||||
@@ -5609,11 +5612,12 @@ var SessionStoreInternal = {
|
||||
}
|
||||
|
||||
let tabbrowser = aWindow.gBrowser;
|
||||
@@ -83,7 +83,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
|
||||
// update the internal state data for this window
|
||||
for (let tab of tabs) {
|
||||
if (tab == aWindow.FirefoxViewHandler.tab) {
|
||||
@@ -5626,6 +5630,7 @@ var SessionStoreInternal = {
|
||||
@@ -5624,6 +5628,7 @@ var SessionStoreInternal = {
|
||||
tabsData.push(tabData);
|
||||
}
|
||||
|
||||
@@ -91,7 +91,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
|
||||
// update tab group state for this window
|
||||
winData.groups = [];
|
||||
for (let tabGroup of aWindow.gBrowser.tabGroups) {
|
||||
@@ -5638,7 +5643,7 @@ var SessionStoreInternal = {
|
||||
@@ -5636,7 +5641,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) {
|
||||
@@ -100,7 +100,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
|
||||
winData.title = tabbrowser.tabs[0].label;
|
||||
}
|
||||
winData.selected = selectedIndex;
|
||||
@@ -5750,8 +5755,8 @@ var SessionStoreInternal = {
|
||||
@@ -5748,8 +5753,8 @@ var SessionStoreInternal = {
|
||||
// selectTab represents.
|
||||
let selectTab = 0;
|
||||
if (overwriteTabs) {
|
||||
@@ -111,7 +111,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
|
||||
selectTab = Math.min(selectTab, winData.tabs.length);
|
||||
}
|
||||
|
||||
@@ -5794,6 +5799,8 @@ var SessionStoreInternal = {
|
||||
@@ -5792,6 +5797,8 @@ var SessionStoreInternal = {
|
||||
winData.tabs,
|
||||
winData.groups ?? []
|
||||
);
|
||||
@@ -120,7 +120,7 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
|
||||
this._log.debug(
|
||||
`restoreWindow, createTabsForSessionRestore returned ${tabs.length} tabs`
|
||||
);
|
||||
@@ -6351,6 +6358,22 @@ var SessionStoreInternal = {
|
||||
@@ -6349,6 +6356,25 @@ var SessionStoreInternal = {
|
||||
|
||||
// Most of tabData has been restored, now continue with restoring
|
||||
// attributes that may trigger external events.
|
||||
@@ -139,11 +139,14 @@ index e954a8df26ed84731b08b151f90a758206946582..64ab1cce10324d574b49fe861975188c
|
||||
+ }
|
||||
+ if (tabData.zenDefaultUserContextId) {
|
||||
+ tab.setAttribute("zenDefaultUserContextId", true);
|
||||
+ }
|
||||
+ if (tabData.zenWorkspace) {
|
||||
+ tab.setAttribute("zen-workspace-id", tabData.zenWorkspace);
|
||||
+ }
|
||||
|
||||
if (tabData.pinned) {
|
||||
tabbrowser.pinTab(tab);
|
||||
@@ -7266,7 +7289,7 @@ var SessionStoreInternal = {
|
||||
@@ -7264,7 +7290,7 @@ var SessionStoreInternal = {
|
||||
|
||||
let groupsToSave = new Map();
|
||||
for (let tIndex = 0; tIndex < window.tabs.length; ) {
|
||||
|
Reference in New Issue
Block a user