mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2025-09-05 19:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: Fixed tests for firefox 141.0, b=no-bug, c=common

Browse Source
This commit is contained in:
Mr. M
2025-07-15 18:37:38 +02:00
parent c88bf27f3d
commit f8be01fe59
3 changed files with 128 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/browser/components/preferences/preferences-xhtml.patch
View File

@@ -1,5 +1,5 @@
diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
index a50fc9cae85527a10c3949163594ce43b68b14c0..28cb5378a58daf0267553d925b0940f3ca2d1ef2 100644 index a50fc9cae85527a10c3949163594ce43b68b14c0..82aec0fb0ebd6ffc6dc3143ddb56e9fe102f0caa 100644
--- a/browser/components/preferences/preferences.xhtml --- a/browser/components/preferences/preferences.xhtml
+++ b/browser/components/preferences/preferences.xhtml +++ b/browser/components/preferences/preferences.xhtml
@@ -44,6 +44,8 @@ @@ -44,6 +44,8 @@
@@ -11,7 +11,19 @@ index a50fc9cae85527a10c3949163594ce43b68b14c0..28cb5378a58daf0267553d925b0940f3
<link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="branding/brand.ftl"/>
<link rel="localization" href="browser/browser.ftl"/> <link rel="localization" href="browser/browser.ftl"/>
<!-- Used by fontbuilder.js --> <!-- Used by fontbuilder.js -->
@@ -116,6 +118,50 @@ @@ -104,6 +106,11 @@
<hbox flex="1">
<vbox class="navigation">
+ <html:moz-input-search
+ id="searchInput"
+ data-l10n-id="search-input-box2"
+ data-l10n-attrs="placeholder, style"
+ />
<!-- category list -->
<richlistbox id="categories" data-l10n-id="category-list" data-l10n-attrs="aria-label">
<richlistitem id="category-general"
@@ -116,6 +123,50 @@
<label class="category-name" flex="1" data-l10n-id="pane-general-title"></label> <label class="category-name" flex="1" data-l10n-id="pane-general-title"></label>
</richlistitem> </richlistitem>
@@ -62,6 +74,18 @@ index a50fc9cae85527a10c3949163594ce43b68b14c0..28cb5378a58daf0267553d925b0940f3
<richlistitem id="category-home" <richlistitem id="category-home"
class="category" class="category"
value="paneHome" value="paneHome"
@@ -227,11 +278,6 @@
<html:a href="about:policies" target="_blank" data-l10n-id="managed-notice"/>
</hbox>
</hbox>
- <html:moz-input-search
- id="searchInput"
- data-l10n-id="search-input-box2"
- data-l10n-attrs="placeholder, style"
- />
</hbox>
</hbox>
<vbox id="mainPrefPane">
@@ -245,6 +291,10 @@ @@ -245,6 +291,10 @@
#include sync.inc.xhtml #include sync.inc.xhtml
#include experimental.inc.xhtml #include experimental.inc.xhtml

137
src/browser/components/tabbrowser/content/tabbrowser-js.patch
View File

@@ -1,5 +1,5 @@
diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32737bf4a1 100644 index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..4ad544fe4dae7b7619b629aa33df6b1066502675 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js --- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js +++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -422,15 +422,49 @@ @@ -422,15 +422,49 @@
@@ -62,7 +62,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
tab.linkedPanel = uniqueId; tab.linkedPanel = uniqueId;
this._selectedTab = tab; this._selectedTab = tab;
this._selectedBrowser = browser; this._selectedBrowser = browser;
@@ -858,11 +893,14 @@ @@ -858,14 +893,18 @@
aTab, aTab,
{ telemetrySource = this.TabMetrics.METRIC_SOURCE.UNKNOWN } = {} { telemetrySource = this.TabMetrics.METRIC_SOURCE.UNKNOWN } = {}
) { ) {
@@ -73,12 +73,17 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
this.showTab(aTab); this.showTab(aTab);
+ const handled = gZenFolders.handleTabPin(aTab); + const handled = gZenFolders.handleTabPin(aTab);
+ if (!handled) this.ungroupTab(aTab); + if (!handled) {
+ else + this.ungroupTab(aTab);
this.#handleTabMove(aTab, () => this.#handleTabMove(aTab, () =>
this.pinnedTabsContainer.appendChild(aTab) - this.pinnedTabsContainer.appendChild(aTab)
+ aTab.hasAttribute("zen-essential") ? gZenWorkspaces.getEssentialsSection(aTab).appendChild(aTab) : this.pinnedTabsContainer.insertBefore(aTab, this.pinnedTabsContainer.lastChild)
); );
@@ -878,11 +916,15 @@ + }
aTab.setAttribute("pinned", "true");
this._updateTabBarForPinnedTabs();
@@ -878,11 +917,15 @@
} }
this.#handleTabMove(aTab, () => { this.#handleTabMove(aTab, () => {
@@ -95,7 +100,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
}); });
aTab.style.marginInlineStart = ""; aTab.style.marginInlineStart = "";
@@ -1060,6 +1102,8 @@ @@ -1060,6 +1103,8 @@
let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"]; let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
@@ -104,7 +109,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
if ( if (
aIconURL && aIconURL &&
!aLoadingPrincipal && !aLoadingPrincipal &&
@@ -1070,6 +1114,9 @@ @@ -1070,6 +1115,9 @@
); );
return; return;
} }
@@ -114,7 +119,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
let browser = this.getBrowserForTab(aTab); let browser = this.getBrowserForTab(aTab);
browser.mIconURL = aIconURL; browser.mIconURL = aIconURL;
@@ -1319,6 +1366,7 @@ @@ -1319,6 +1367,7 @@
if (!this._previewMode) { if (!this._previewMode) {
newTab.recordTimeFromUnloadToReload(); newTab.recordTimeFromUnloadToReload();
newTab.updateLastAccessed(); newTab.updateLastAccessed();
@@ -122,7 +127,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
oldTab.updateLastAccessed(); oldTab.updateLastAccessed();
// if this is the foreground window, update the last-seen timestamps. // if this is the foreground window, update the last-seen timestamps.
if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) { if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
@@ -1471,6 +1519,9 @@ @@ -1471,6 +1520,9 @@
} }
let activeEl = document.activeElement; let activeEl = document.activeElement;
@@ -132,7 +137,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
// If focus is on the old tab, move it to the new tab. // If focus is on the old tab, move it to the new tab.
if (activeEl == oldTab) { if (activeEl == oldTab) {
newTab.focus(); newTab.focus();
@@ -1794,7 +1845,8 @@ @@ -1794,7 +1846,8 @@
} }
_setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) { _setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
@@ -142,7 +147,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
return false; return false;
} }
@@ -1902,7 +1954,7 @@ @@ -1902,7 +1955,7 @@
newIndex = this.selectedTab._tPos + 1; newIndex = this.selectedTab._tPos + 1;
} }
@@ -151,7 +156,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
if (this.isTabGroupLabel(targetTab)) { if (this.isTabGroupLabel(targetTab)) {
throw new Error( throw new Error(
"Replacing a tab group label with a tab is not supported" "Replacing a tab group label with a tab is not supported"
@@ -2166,6 +2218,7 @@ @@ -2166,6 +2219,7 @@
uriIsAboutBlank, uriIsAboutBlank,
userContextId, userContextId,
skipLoad, skipLoad,
@@ -159,7 +164,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
} = {}) { } = {}) {
let b = document.createXULElement("browser"); let b = document.createXULElement("browser");
// Use the JSM global to create the permanentKey, so that if the // Use the JSM global to create the permanentKey, so that if the
@@ -2239,8 +2292,7 @@ @@ -2239,8 +2293,7 @@
// we use a different attribute name for this? // we use a different attribute name for this?
b.setAttribute("name", name); b.setAttribute("name", name);
} }
@@ -169,7 +174,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
b.setAttribute("transparent", "true"); b.setAttribute("transparent", "true");
} }
@@ -2405,7 +2457,7 @@ @@ -2405,7 +2458,7 @@
let panel = this.getPanel(browser); let panel = this.getPanel(browser);
let uniqueId = this._generateUniquePanelID(); let uniqueId = this._generateUniquePanelID();
@@ -178,7 +183,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
aTab.linkedPanel = uniqueId; aTab.linkedPanel = uniqueId;
// Inject the <browser> into the DOM if necessary. // Inject the <browser> into the DOM if necessary.
@@ -2464,8 +2516,8 @@ @@ -2464,8 +2517,8 @@
// If we transitioned from one browser to two browsers, we need to set // If we transitioned from one browser to two browsers, we need to set
// hasSiblings=false on both the existing browser and the new browser. // hasSiblings=false on both the existing browser and the new browser.
if (this.tabs.length == 2) { if (this.tabs.length == 2) {
@@ -189,7 +194,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
} else { } else {
aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1; aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
} }
@@ -2709,6 +2761,8 @@ @@ -2709,6 +2762,8 @@
schemelessInput, schemelessInput,
hasValidUserGestureActivation = false, hasValidUserGestureActivation = false,
textDirectiveUserActivation = false, textDirectiveUserActivation = false,
@@ -198,7 +203,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
} = {} } = {}
) { ) {
// all callers of addTab that pass a params object need to pass // all callers of addTab that pass a params object need to pass
@@ -2719,6 +2773,12 @@ @@ -2719,6 +2774,12 @@
); );
} }
@@ -211,7 +216,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
if (!UserInteraction.running("browser.tabs.opening", window)) { if (!UserInteraction.running("browser.tabs.opening", window)) {
UserInteraction.start("browser.tabs.opening", "initting", window); UserInteraction.start("browser.tabs.opening", "initting", window);
} }
@@ -2782,6 +2842,19 @@ @@ -2782,6 +2843,19 @@
noInitialLabel, noInitialLabel,
skipBackgroundNotify, skipBackgroundNotify,
}); });
@@ -231,7 +236,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
if (insertTab) { if (insertTab) {
// Insert the tab into the tab container in the correct position. // Insert the tab into the tab container in the correct position.
this.#insertTabAtIndex(t, { this.#insertTabAtIndex(t, {
@@ -2790,6 +2863,7 @@ @@ -2790,6 +2864,7 @@
ownerTab, ownerTab,
openerTab, openerTab,
pinned, pinned,
@@ -239,7 +244,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
bulkOrderedOpen, bulkOrderedOpen,
tabGroup: tabGroup ?? openerTab?.group, tabGroup: tabGroup ?? openerTab?.group,
}); });
@@ -2808,6 +2882,7 @@ @@ -2808,6 +2883,7 @@
openWindowInfo, openWindowInfo,
skipLoad, skipLoad,
triggeringRemoteType, triggeringRemoteType,
@@ -247,7 +252,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
})); }));
if (focusUrlBar) { if (focusUrlBar) {
@@ -2928,6 +3003,12 @@ @@ -2928,6 +3004,12 @@
} }
} }
@@ -260,7 +265,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
// Additionally send pinned tab events // Additionally send pinned tab events
if (pinned) { if (pinned) {
this.#notifyPinnedStatus(t); this.#notifyPinnedStatus(t);
@@ -3016,10 +3097,10 @@ @@ -3016,10 +3098,10 @@
isAdoptingGroup = false, isAdoptingGroup = false,
isUserTriggered = false, isUserTriggered = false,
telemetryUserCreateSource = "unknown", telemetryUserCreateSource = "unknown",
@@ -272,7 +277,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
} }
if (!color) { if (!color) {
@@ -3040,7 +3121,12 @@ @@ -3040,7 +3122,12 @@
label, label,
isAdoptingGroup isAdoptingGroup
); );
@@ -286,7 +291,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
group, group,
insertBefore?.group ?? insertBefore insertBefore?.group ?? insertBefore
); );
@@ -3357,6 +3443,7 @@ @@ -3357,6 +3444,7 @@
openWindowInfo, openWindowInfo,
skipLoad, skipLoad,
triggeringRemoteType, triggeringRemoteType,
@@ -294,7 +299,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
} }
) { ) {
// If we don't have a preferred remote type (or it is `NOT_REMOTE`), and // If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
@@ -3426,6 +3513,7 @@ @@ -3426,6 +3514,7 @@
openWindowInfo, openWindowInfo,
name, name,
skipLoad, skipLoad,
@@ -302,7 +307,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
}); });
} }
@@ -3570,7 +3658,9 @@ @@ -3570,7 +3659,9 @@
let hiddenTabs = new Map(); let hiddenTabs = new Map();
/** @type {Map<TabGroupStateData['id'], TabGroupWorkingData>} */ /** @type {Map<TabGroupStateData['id'], TabGroupWorkingData>} */
let tabGroupWorkingData = new Map(); let tabGroupWorkingData = new Map();
@@ -313,7 +318,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
for (const tabGroupData of tabGroupDataList) { for (const tabGroupData of tabGroupDataList) {
tabGroupWorkingData.set(tabGroupData.id, { tabGroupWorkingData.set(tabGroupData.id, {
stateData: tabGroupData, stateData: tabGroupData,
@@ -3613,7 +3703,7 @@ @@ -3613,7 +3704,7 @@
// Add a new tab if needed. // Add a new tab if needed.
if (!tab) { if (!tab) {
let createLazyBrowser = let createLazyBrowser =
@@ -322,7 +327,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
let url = "about:blank"; let url = "about:blank";
if (tabData.entries?.length) { if (tabData.entries?.length) {
@@ -3651,7 +3741,8 @@ @@ -3651,7 +3742,8 @@
skipLoad: true, skipLoad: true,
preferredRemoteType, preferredRemoteType,
}); });
@@ -332,7 +337,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
if (select) { if (select) {
tabToSelect = tab; tabToSelect = tab;
} }
@@ -3663,7 +3754,8 @@ @@ -3663,7 +3755,8 @@
this.pinTab(tab); this.pinTab(tab);
// Then ensure all the tab open/pinning information is sent. // Then ensure all the tab open/pinning information is sent.
this._fireTabOpen(tab, {}); this._fireTabOpen(tab, {});
@@ -342,7 +347,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
let { groupId } = tabData; let { groupId } = tabData;
const tabGroup = tabGroupWorkingData.get(groupId); const tabGroup = tabGroupWorkingData.get(groupId);
// if a tab refers to a tab group we don't know, skip any group // if a tab refers to a tab group we don't know, skip any group
@@ -3677,7 +3769,10 @@ @@ -3677,7 +3770,10 @@
tabGroup.stateData.id, tabGroup.stateData.id,
tabGroup.stateData.color, tabGroup.stateData.color,
tabGroup.stateData.collapsed, tabGroup.stateData.collapsed,
@@ -354,7 +359,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
); );
tabsFragment.appendChild(tabGroup.node); tabsFragment.appendChild(tabGroup.node);
} }
@@ -3722,9 +3817,23 @@ @@ -3722,9 +3818,23 @@
// to remove the old selected tab. // to remove the old selected tab.
if (tabToSelect) { if (tabToSelect) {
let leftoverTab = this.selectedTab; let leftoverTab = this.selectedTab;
@@ -370,15 +375,15 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
+ gZenWorkspaces._initialTab._shouldRemove = true; + gZenWorkspaces._initialTab._shouldRemove = true;
+ } + }
+ } + }
} + }
+ else { + else {
+ gZenWorkspaces._tabToRemoveForEmpty = this.selectedTab; + gZenWorkspaces._tabToRemoveForEmpty = this.selectedTab;
+ } }
+ this._hasAlreadyInitializedZenSessionStore = true; + this._hasAlreadyInitializedZenSessionStore = true;
if (tabs.length > 1 || !tabs[0].selected) { if (tabs.length > 1 || !tabs[0].selected) {
this._updateTabsAfterInsert(); this._updateTabsAfterInsert();
@@ -3919,7 +4028,7 @@ @@ -3919,7 +4029,7 @@
// Ensure we have an index if one was not provided. // Ensure we have an index if one was not provided.
if (typeof elementIndex != "number" && typeof tabIndex != "number") { if (typeof elementIndex != "number" && typeof tabIndex != "number") {
// Move the new tab after another tab if needed, to the end otherwise. // Move the new tab after another tab if needed, to the end otherwise.
@@ -387,7 +392,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
if ( if (
!bulkOrderedOpen && !bulkOrderedOpen &&
((openerTab && ((openerTab &&
@@ -3942,7 +4051,7 @@ @@ -3942,7 +4052,7 @@
) { ) {
elementIndex = Infinity; elementIndex = Infinity;
} else if (previousTab.visible) { } else if (previousTab.visible) {
@@ -396,7 +401,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
} else if (previousTab == FirefoxViewHandler.tab) { } else if (previousTab == FirefoxViewHandler.tab) {
elementIndex = 0; elementIndex = 0;
} }
@@ -3970,14 +4079,14 @@ @@ -3970,14 +4080,14 @@
} }
// Ensure index is within bounds. // Ensure index is within bounds.
if (tab.pinned) { if (tab.pinned) {
@@ -415,7 +420,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
// Prevent a flash of unstyled content by setting up the tab content // Prevent a flash of unstyled content by setting up the tab content
// and inherited attributes before appending it (see Bug 1592054): // and inherited attributes before appending it (see Bug 1592054):
@@ -3985,7 +4094,7 @@ @@ -3985,7 +4095,7 @@
this.tabContainer._invalidateCachedTabs(); this.tabContainer._invalidateCachedTabs();
@@ -424,7 +429,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
if (this.isTab(itemAfter) && itemAfter.group == tabGroup) { if (this.isTab(itemAfter) && itemAfter.group == tabGroup) {
// Place at the front of, or between tabs in, the same tab group // Place at the front of, or between tabs in, the same tab group
this.tabContainer.insertBefore(tab, itemAfter); this.tabContainer.insertBefore(tab, itemAfter);
@@ -4018,6 +4127,7 @@ @@ -4018,6 +4128,7 @@
if (pinned) { if (pinned) {
this._updateTabBarForPinnedTabs(); this._updateTabBarForPinnedTabs();
} }
@@ -432,7 +437,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
TabBarVisibility.update(); TabBarVisibility.update();
} }
@@ -4307,6 +4417,9 @@ @@ -4307,6 +4418,9 @@
return; return;
} }
@@ -442,7 +447,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
this.removeTabs(selectedTabs, { isUserTriggered, telemetrySource }); this.removeTabs(selectedTabs, { isUserTriggered, telemetrySource });
} }
@@ -4568,6 +4681,7 @@ @@ -4568,6 +4682,7 @@
telemetrySource, telemetrySource,
} = {} } = {}
) { ) {
@@ -450,7 +455,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
// When 'closeWindowWithLastTab' pref is enabled, closing all tabs // When 'closeWindowWithLastTab' pref is enabled, closing all tabs
// can be considered equivalent to closing the window. // can be considered equivalent to closing the window.
if ( if (
@@ -4657,6 +4771,7 @@ @@ -4657,6 +4772,7 @@
if (lastToClose) { if (lastToClose) {
this.removeTab(lastToClose, aParams); this.removeTab(lastToClose, aParams);
} }
@@ -458,7 +463,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
} catch (e) { } catch (e) {
console.error(e); console.error(e);
} }
@@ -4695,6 +4810,12 @@ @@ -4695,6 +4811,12 @@
aTab._closeTimeNoAnimTimerId = Glean.browserTabclose.timeNoAnim.start(); aTab._closeTimeNoAnimTimerId = Glean.browserTabclose.timeNoAnim.start();
} }
@@ -471,7 +476,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
// Handle requests for synchronously removing an already // Handle requests for synchronously removing an already
// asynchronously closing tab. // asynchronously closing tab.
if (!animate && aTab.closing) { if (!animate && aTab.closing) {
@@ -4709,6 +4830,9 @@ @@ -4709,6 +4831,9 @@
// state). // state).
let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width; let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
let isLastTab = this.#isLastTabInWindow(aTab); let isLastTab = this.#isLastTabInWindow(aTab);
@@ -481,7 +486,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
if ( if (
!this._beginRemoveTab(aTab, { !this._beginRemoveTab(aTab, {
closeWindowFastpath: true, closeWindowFastpath: true,
@@ -4891,7 +5015,7 @@ @@ -4891,7 +5016,7 @@
closeWindowWithLastTab != null closeWindowWithLastTab != null
? closeWindowWithLastTab ? closeWindowWithLastTab
: !window.toolbar.visible || : !window.toolbar.visible ||
@@ -490,7 +495,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
if (closeWindow) { if (closeWindow) {
// We've already called beforeunload on all the relevant tabs if we get here, // We've already called beforeunload on all the relevant tabs if we get here,
@@ -4915,6 +5039,7 @@ @@ -4915,6 +5040,7 @@
newTab = true; newTab = true;
} }
@@ -498,7 +503,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
aTab._endRemoveArgs = [closeWindow, newTab]; aTab._endRemoveArgs = [closeWindow, newTab];
// swapBrowsersAndCloseOther will take care of closing the window without animation. // swapBrowsersAndCloseOther will take care of closing the window without animation.
@@ -4955,9 +5080,7 @@ @@ -4955,9 +5081,7 @@
aTab._mouseleave(); aTab._mouseleave();
if (newTab) { if (newTab) {
@@ -509,7 +514,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
} else { } else {
TabBarVisibility.update(); TabBarVisibility.update();
} }
@@ -5090,6 +5213,7 @@ @@ -5090,6 +5214,7 @@
this.tabs[i]._tPos = i; this.tabs[i]._tPos = i;
} }
@@ -517,7 +522,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
if (!this._windowIsClosing) { if (!this._windowIsClosing) {
// update tab close buttons state // update tab close buttons state
this.tabContainer._updateCloseButtons(); this.tabContainer._updateCloseButtons();
@@ -5302,6 +5426,7 @@ @@ -5302,6 +5427,7 @@
} }
let excludeTabs = new Set(aExcludeTabs); let excludeTabs = new Set(aExcludeTabs);
@@ -525,7 +530,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
// If this tab has a successor, it should be selectable, since // If this tab has a successor, it should be selectable, since
// hiding or closing a tab removes that tab as a successor. // hiding or closing a tab removes that tab as a successor.
@@ -5314,13 +5439,13 @@ @@ -5314,13 +5440,13 @@
!excludeTabs.has(aTab.owner) && !excludeTabs.has(aTab.owner) &&
Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose") Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
) { ) {
@@ -541,7 +546,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
); );
let tab = this.tabContainer.findNextTab(aTab, { let tab = this.tabContainer.findNextTab(aTab, {
@@ -5336,7 +5461,7 @@ @@ -5336,7 +5462,7 @@
} }
if (tab) { if (tab) {
@@ -550,7 +555,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
} }
// If no qualifying visible tab was found, see if there is a tab in // If no qualifying visible tab was found, see if there is a tab in
@@ -5357,7 +5482,7 @@ @@ -5357,7 +5483,7 @@
}); });
} }
@@ -559,7 +564,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
} }
_blurTab(aTab) { _blurTab(aTab) {
@@ -5759,10 +5884,10 @@ @@ -5759,10 +5885,10 @@
SessionStore.deleteCustomTabValue(aTab, "hiddenBy"); SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
} }
@@ -572,7 +577,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
aTab.selected || aTab.selected ||
aTab.closing || aTab.closing ||
// Tabs that are sharing the screen, microphone or camera cannot be hidden. // Tabs that are sharing the screen, microphone or camera cannot be hidden.
@@ -5952,7 +6077,7 @@ @@ -5952,7 +6078,7 @@
* `true` if element is a `<tab-group>` * `true` if element is a `<tab-group>`
*/ */
isTabGroup(element) { isTabGroup(element) {
@@ -581,7 +586,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
} }
/** /**
@@ -6029,7 +6154,7 @@ @@ -6029,7 +6155,7 @@
// Don't allow mixing pinned and unpinned tabs. // Don't allow mixing pinned and unpinned tabs.
if (this.isTab(element) && element.pinned) { if (this.isTab(element) && element.pinned) {
@@ -590,7 +595,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
} else { } else {
tabIndex = Math.max(tabIndex, this.pinnedTabCount); tabIndex = Math.max(tabIndex, this.pinnedTabCount);
} }
@@ -6055,10 +6180,16 @@ @@ -6055,10 +6181,16 @@
this.#handleTabMove( this.#handleTabMove(
element, element,
() => { () => {
@@ -609,7 +614,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
if (neighbor && this.isTab(element) && tabIndex > element._tPos) { if (neighbor && this.isTab(element) && tabIndex > element._tPos) {
neighbor.after(element); neighbor.after(element);
} else { } else {
@@ -6122,7 +6253,7 @@ @@ -6122,7 +6254,7 @@
moveBefore = true; moveBefore = true;
} }
} }
@@ -618,7 +623,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
element = element.group; element = element.group;
if (targetElement?.group) { if (targetElement?.group) {
targetElement = targetElement.group; targetElement = targetElement.group;
@@ -6130,8 +6261,12 @@ @@ -6130,8 +6262,12 @@
} }
// Don't allow mixing pinned and unpinned tabs. // Don't allow mixing pinned and unpinned tabs.
@@ -632,7 +637,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
moveBefore = false; moveBefore = false;
} else if (!element.pinned && targetElement && targetElement.pinned) { } else if (!element.pinned && targetElement && targetElement.pinned) {
// If the caller asks to move an unpinned element next to a pinned // If the caller asks to move an unpinned element next to a pinned
@@ -6145,7 +6280,7 @@ @@ -6145,7 +6281,7 @@
// move the tab group right before the first unpinned tab. // move the tab group right before the first unpinned tab.
// 4. Moving a tab group and the first unpinned tab is grouped: // 4. Moving a tab group and the first unpinned tab is grouped:
// move the tab group right before the first unpinned tab's tab group. // move the tab group right before the first unpinned tab's tab group.
@@ -641,7 +646,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
if (targetElement.group) { if (targetElement.group) {
targetElement = targetElement.group; targetElement = targetElement.group;
} }
@@ -6153,6 +6288,7 @@ @@ -6153,6 +6289,7 @@
} }
let getContainer = () => let getContainer = () =>
@@ -649,7 +654,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
element.pinned element.pinned
? this.tabContainer.pinnedTabsContainer ? this.tabContainer.pinnedTabsContainer
: this.tabContainer; : this.tabContainer;
@@ -6210,7 +6346,7 @@ @@ -6210,7 +6347,7 @@
if (!this.isTab(aTab)) { if (!this.isTab(aTab)) {
throw new Error("Can only move a tab into a tab group"); throw new Error("Can only move a tab into a tab group");
} }
@@ -658,7 +663,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
return; return;
} }
if (aTab.group && aTab.group.id === aGroup.id) { if (aTab.group && aTab.group.id === aGroup.id) {
@@ -6304,6 +6440,10 @@ @@ -6304,6 +6441,10 @@
moveActionCallback(); moveActionCallback();
@@ -669,7 +674,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
// Clear tabs cache after moving nodes because the order of tabs may have // Clear tabs cache after moving nodes because the order of tabs may have
// changed. // changed.
this.tabContainer._invalidateCachedTabs(); this.tabContainer._invalidateCachedTabs();
@@ -7198,7 +7338,7 @@ @@ -7198,7 +7339,7 @@
// preventDefault(). It will still raise the window if appropriate. // preventDefault(). It will still raise the window if appropriate.
break; break;
} }
@@ -678,7 +683,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
window.focus(); window.focus();
aEvent.preventDefault(); aEvent.preventDefault();
break; break;
@@ -8143,6 +8283,7 @@ @@ -8143,6 +8284,7 @@
aWebProgress.isTopLevel aWebProgress.isTopLevel
) { ) {
this.mTab.setAttribute("busy", "true"); this.mTab.setAttribute("busy", "true");
@@ -686,7 +691,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
gBrowser._tabAttrModified(this.mTab, ["busy"]); gBrowser._tabAttrModified(this.mTab, ["busy"]);
this.mTab._notselectedsinceload = !this.mTab.selected; this.mTab._notselectedsinceload = !this.mTab.selected;
} }
@@ -9108,7 +9249,7 @@ var TabContextMenu = { @@ -9108,7 +9250,7 @@ var TabContextMenu = {
); );
contextUnpinSelectedTabs.hidden = contextUnpinSelectedTabs.hidden =
!this.contextTab.pinned || !this.multiselected; !this.contextTab.pinned || !this.multiselected;
@@ -695,7 +700,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..c49ef74757bb8a43bf400d60474a8e32
// Move Tab items // Move Tab items
let contextMoveTabOptions = document.getElementById( let contextMoveTabOptions = document.getElementById(
"context_moveTabOptions" "context_moveTabOptions"
@@ -9384,6 +9525,7 @@ var TabContextMenu = { @@ -9384,6 +9526,7 @@ var TabContextMenu = {
) )
); );
} else { } else {

31
src/toolkit/themes/shared/in-content/common-shared-css.patch Normal file
View File

@@ -0,0 +1,31 @@
diff --git a/toolkit/themes/shared/in-content/common-shared.css b/toolkit/themes/shared/in-content/common-shared.css
index 3c72faca31b8a52a1668f78c8154a5726790a6dc..583348194113521b0a47d6ee3272c485fcd33db9 100644
--- a/toolkit/themes/shared/in-content/common-shared.css
+++ b/toolkit/themes/shared/in-content/common-shared.css
@@ -4,7 +4,7 @@
@import url("chrome://global/skin/design-system/tokens-brand.css");
@import url("chrome://global/skin/design-system/text-and-typography.css");
-
+@import url("chrome://browser/content/zen-styles/zen-theme.css");
@namespace html "http://www.w3.org/1999/xhtml";
@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
@@ -777,7 +777,7 @@ html|*#categories[last-input-type="mouse"] > html|button.category:focus-visible
fill-opacity: 1;
}
-@media (max-width: 830px) {
+@media (max-width: 130px) {
:root {
--in-content-sidebar-width: 118px;
}
@@ -1167,7 +1167,7 @@ xul|*.sidebar-footer-link {
user-select: none;
}
-@media (max-width: 830px) {
+@media (max-width: 130px) {
.sidebar-footer-list {
margin-inline-start: 40px;
align-items: flex-start;