LeMoonStar/zen-realigned
1
0
Fork 0
forked from ZenBrowserMirrors/zen-desktop
Code Pull requests Activity

chore: Updated to ff 138.0 and recalculated patches, b=(no-bug), c=tabs, media

Browse source
This commit is contained in:
mr. m 2025-04-22 15:08:34 +02:00
parent 0eb1c7d419
commit 09ec1ad864
No known key found for this signature in database
GPG key ID: 419302196C23B258
44 changed files with 178 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

118
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
index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26ada76767d 100644
index 6dece2b9d0462d90a28e75350ce983d87816ef73..86f0002b6fab433d62d460e8f8babac91ffa9185 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -415,11 +415,58 @@
@ -63,7 +63,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
}
return i;
}
@@ -549,6 +596,7 @@
@@ -571,6 +618,7 @@
this.tabpanels.appendChild(panel);
let tab = this.tabs[0];
@ -71,7 +71,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
tab.linkedPanel = uniqueId;
this._selectedTab = tab;
this._selectedBrowser = browser;
@@ -814,11 +862,13 @@
@@ -836,11 +884,13 @@
}
this.showTab(aTab);
@ -88,7 +88,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
this.moveTabTo(aTab, {
tabIndex: this.pinnedTabCount,
forceUngrouped: true,
@@ -835,12 +885,15 @@
@@ -857,12 +907,15 @@
}
if (this.tabContainer.verticalMode) {
@ -105,7 +105,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
});
} else {
this.moveTabTo(aTab, {
@@ -1024,6 +1077,8 @@
@@ -1046,6 +1099,8 @@
let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
@ -114,7 +114,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
if (
aIconURL &&
!aLoadingPrincipal &&
@@ -1034,6 +1089,9 @@
@@ -1056,6 +1111,9 @@
);
return;
}
@ -124,7 +124,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
let browser = this.getBrowserForTab(aTab);
browser.mIconURL = aIconURL;
@@ -1283,6 +1341,7 @@
@@ -1305,6 +1363,7 @@
if (!this._previewMode) {
newTab.recordTimeFromUnloadToReload();
newTab.updateLastAccessed();
@ -132,7 +132,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
oldTab.updateLastAccessed();
// if this is the foreground window, update the last-seen timestamps.
if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
@@ -1435,6 +1494,9 @@
@@ -1457,6 +1516,9 @@
}
let activeEl = document.activeElement;
@ -142,7 +142,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
// If focus is on the old tab, move it to the new tab.
if (activeEl == oldTab) {
newTab.focus();
@@ -1758,7 +1820,8 @@
@@ -1780,7 +1842,8 @@
}
_setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
@ -152,7 +152,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
return false;
}
@@ -1866,7 +1929,7 @@
@@ -1888,7 +1951,7 @@
newIndex = this.selectedTab._tPos + 1;
}
@ -161,7 +161,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
if (this.isTabGroupLabel(targetTab)) {
throw new Error(
"Replacing a tab group label with a tab is not supported"
@@ -2130,6 +2193,7 @@
@@ -2152,6 +2215,7 @@
uriIsAboutBlank,
userContextId,
skipLoad,
@ -169,7 +169,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
} = {}) {
let b = document.createXULElement("browser");
// Use the JSM global to create the permanentKey, so that if the
@@ -2203,8 +2267,7 @@
@@ -2225,8 +2289,7 @@
// we use a different attribute name for this?
b.setAttribute("name", name);
}
@ -179,7 +179,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
b.setAttribute("transparent", "true");
}
@@ -2369,7 +2432,7 @@
@@ -2391,7 +2454,7 @@
let panel = this.getPanel(browser);
let uniqueId = this._generateUniquePanelID();
@ -188,7 +188,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
aTab.linkedPanel = uniqueId;
// Inject the <browser> into the DOM if necessary.
@@ -2428,8 +2491,8 @@
@@ -2450,8 +2513,8 @@
// If we transitioned from one browser to two browsers, we need to set
// hasSiblings=false on both the existing browser and the new browser.
if (this.tabs.length == 2) {
@ -199,7 +199,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
} else {
aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
}
@@ -2657,6 +2720,7 @@
@@ -2679,6 +2742,7 @@
schemelessInput,
hasValidUserGestureActivation = false,
textDirectiveUserActivation = false,
@ -207,7 +207,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
} = {}
) {
// all callers of addTab that pass a params object need to pass
@@ -2667,6 +2731,12 @@
@@ -2689,6 +2753,12 @@
);
}
@ -220,7 +220,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
if (!UserInteraction.running("browser.tabs.opening", window)) {
UserInteraction.start("browser.tabs.opening", "initting", window);
}
@@ -2730,6 +2800,16 @@
@@ -2752,6 +2822,16 @@
noInitialLabel,
skipBackgroundNotify,
});
@ -237,15 +237,15 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
if (insertTab) {
if (typeof index == "number") {
elementIndex = this.#tabIndexToElementIndex(index);
@@ -2756,6 +2836,7 @@
initialBrowsingContextGroupId,
@@ -2779,6 +2859,7 @@
openWindowInfo,
skipLoad,
triggeringRemoteType,
+ _forZenEmptyTab,
}));
if (focusUrlBar) {
@@ -2875,6 +2956,9 @@
@@ -2898,6 +2979,9 @@
}
}
@ -255,7 +255,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
// Additionally send pinned tab events
if (pinned) {
this._notifyPinnedStatus(t);
@@ -2922,12 +3006,15 @@
@@ -2945,12 +3029,15 @@
* @param {string} [label=]
* @returns {MozTabbrowserTabGroup}
*/
@ -272,7 +272,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
return group;
}
@@ -2970,6 +3057,7 @@
@@ -2993,6 +3080,7 @@
insertBefore = null,
isUserTriggered = false,
telemetryUserCreateSource = "unknown",
@ -280,7 +280,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
} = {}
) {
if (!tabs?.length) {
@@ -2988,7 +3076,12 @@
@@ -3011,7 +3099,12 @@
id = `${Date.now()}-${Math.round(Math.random() * 100)}`;
}
let group = this._createTabGroup(id, color, false, label);
@ -294,15 +294,15 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
group,
insertBefore?.group ?? insertBefore
);
@@ -3318,6 +3411,7 @@
initialBrowsingContextGroupId,
@@ -3342,6 +3435,7 @@
openWindowInfo,
skipLoad,
triggeringRemoteType,
+ _forZenEmptyTab
}
) {
// If we don't have a preferred remote type, and we have a remote
@@ -3381,6 +3475,7 @@
// If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
@@ -3411,6 +3505,7 @@
openWindowInfo,
name,
skipLoad,
@ -310,7 +310,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
});
}
@@ -3559,6 +3654,27 @@
@@ -3589,6 +3684,27 @@
) {
tabWasReused = true;
tab = this.selectedTab;
@ -338,7 +338,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
if (!tabData.pinned) {
this.unpinTab(tab);
} else {
@@ -3607,8 +3723,28 @@
@@ -3637,8 +3753,28 @@
skipLoad: true,
preferredRemoteType,
});
@ -369,7 +369,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
tabToSelect = tab;
}
}
@@ -3631,7 +3767,8 @@
@@ -3661,7 +3797,8 @@
// needs calling:
shouldUpdateForPinnedTabs = true;
}
@ -379,7 +379,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
let { groupId } = tabData;
const tabGroup = tabGroupWorkingData.get(groupId);
// if a tab refers to a tab group we don't know, skip any group
@@ -3645,7 +3782,10 @@
@@ -3675,7 +3812,10 @@
tabGroup.stateData.id,
tabGroup.stateData.color,
tabGroup.stateData.collapsed,
@ -391,7 +391,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
);
tabsFragment.appendChild(tabGroup.node);
}
@@ -3696,6 +3836,10 @@
@@ -3726,6 +3866,10 @@
this.selectedTab = tabToSelect;
this.removeTab(leftoverTab);
}
@ -402,7 +402,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
if (tabs.length > 1 || !tabs[0].selected) {
this._updateTabsAfterInsert();
@@ -3882,7 +4026,7 @@
@@ -3912,7 +4056,7 @@
// Ensure we have an index if one was not provided.
if (typeof index != "number") {
// Move the new tab after another tab if needed, to the end otherwise.
@ -411,7 +411,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
if (
!bulkOrderedOpen &&
((openerTab &&
@@ -3928,18 +4072,18 @@
@@ -3958,18 +4102,18 @@
// Ensure index is within bounds.
if (tab.pinned) {
@ -434,7 +434,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
if (this.isTab(itemAfter) && itemAfter.group == tabGroup) {
// Place at the front of, or between tabs in, the same tab group
this.tabContainer.insertBefore(tab, itemAfter);
@@ -4260,6 +4404,9 @@
@@ -4290,6 +4434,9 @@
return;
}
@ -444,7 +444,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
this.removeTabs(selectedTabs, { telemetrySource });
}
@@ -4512,6 +4659,7 @@
@@ -4542,6 +4689,7 @@
telemetrySource,
} = {}
) {
@ -452,7 +452,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
// When 'closeWindowWithLastTab' pref is enabled, closing all tabs
// can be considered equivalent to closing the window.
if (
@@ -4596,6 +4744,7 @@
@@ -4626,6 +4774,7 @@
if (lastToClose) {
this.removeTab(lastToClose, aParams);
}
@ -460,7 +460,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
} catch (e) {
console.error(e);
}
@@ -4620,6 +4769,7 @@
@@ -4650,6 +4799,7 @@
telemetrySource,
} = {}
) {
@ -468,7 +468,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
if (UserInteraction.running("browser.tabs.opening", window)) {
UserInteraction.finish("browser.tabs.opening", window);
}
@@ -4633,6 +4783,12 @@
@@ -4663,6 +4813,12 @@
aTab._closeTimeNoAnimTimerId = Glean.browserTabclose.timeNoAnim.start();
}
@ -481,7 +481,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
// Handle requests for synchronously removing an already
// asynchronously closing tab.
if (!animate && aTab.closing) {
@@ -4647,7 +4803,9 @@
@@ -4677,7 +4833,9 @@
// frame created for it (for example, by updating the visually selected
// state).
let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@ -492,7 +492,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
if (
!this._beginRemoveTab(aTab, {
closeWindowFastpath: true,
@@ -4810,7 +4968,7 @@
@@ -4840,7 +4998,7 @@
closeWindowWithLastTab != null
? closeWindowWithLastTab
: !window.toolbar.visible ||
@ -501,7 +501,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
if (closeWindow) {
// We've already called beforeunload on all the relevant tabs if we get here,
@@ -4834,6 +4992,7 @@
@@ -4864,6 +5022,7 @@
newTab = true;
}
@ -509,7 +509,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
aTab._endRemoveArgs = [closeWindow, newTab];
// swapBrowsersAndCloseOther will take care of closing the window without animation.
@@ -4873,9 +5032,7 @@
@@ -4903,9 +5062,7 @@
aTab._mouseleave();
if (newTab) {
@ -520,7 +520,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
} else {
TabBarVisibility.update();
}
@@ -5004,6 +5161,8 @@
@@ -5034,6 +5191,8 @@
this.tabs[i]._tPos = i;
}
@ -529,7 +529,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
if (!this._windowIsClosing) {
if (wasPinned) {
this.tabContainer._positionPinnedTabs();
@@ -5129,8 +5288,8 @@
@@ -5159,8 +5318,8 @@
return closedCount;
}
@ -540,7 +540,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
if (unloadBlocked) {
return;
}
@@ -5230,13 +5389,13 @@
@@ -5260,13 +5419,13 @@
!excludeTabs.has(aTab.owner) &&
Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
) {
@ -556,7 +556,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
);
let tab = this.tabContainer.findNextTab(aTab, {
@@ -5252,7 +5411,7 @@
@@ -5282,7 +5441,7 @@
}
if (tab) {
@ -565,7 +565,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
}
// If no qualifying visible tab was found, see if there is a tab in
@@ -5273,7 +5432,7 @@
@@ -5303,7 +5462,7 @@
});
}
@ -574,7 +574,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
}
_blurTab(aTab) {
@@ -5674,10 +5833,10 @@
@@ -5704,10 +5863,10 @@
SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
}
@ -587,7 +587,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
aTab.selected ||
aTab.closing ||
// Tabs that are sharing the screen, microphone or camera cannot be hidden.
@@ -5971,7 +6130,7 @@
@@ -6001,7 +6160,7 @@
// Don't allow mixing pinned and unpinned tabs.
if (this.isTab(element) && element.pinned) {
@ -596,7 +596,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
} else {
tabIndex = Math.max(tabIndex, this.pinnedTabCount);
}
@@ -5998,9 +6157,16 @@
@@ -6028,9 +6187,16 @@
element,
() => {
let neighbor = this.tabs[tabIndex];
@ -614,7 +614,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
if (neighbor && this.isTab(element) && tabIndex > element._tPos) {
neighbor.after(element);
} else {
@@ -6069,7 +6235,9 @@
@@ -6099,7 +6265,9 @@
targetElement = targetElement.group;
}
}
@ -625,7 +625,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
// Don't allow mixing pinned and unpinned tabs.
if (element.pinned && !targetElement?.pinned) {
targetElement = this.tabs[this.pinnedTabCount - 1];
@@ -6079,7 +6247,13 @@
@@ -6109,7 +6277,13 @@
moveBefore = true;
}
@ -639,7 +639,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
if (element.pinned && this.tabContainer.verticalMode) {
return this.tabContainer.verticalPinnedTabsContainer;
}
@@ -6139,7 +6313,7 @@
@@ -6169,7 +6343,7 @@
if (!this.isTab(aTab)) {
throw new Error("Can only move a tab into a tab group");
}
@ -648,7 +648,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
return;
}
if (aTab.group && aTab.group.id === aGroup.id) {
@@ -6233,6 +6407,10 @@
@@ -6263,6 +6437,10 @@
moveActionCallback();
@ -659,7 +659,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
// Clear tabs cache after moving nodes because the order of tabs may have
// changed.
this.tabContainer._invalidateCachedTabs();
@@ -7050,7 +7228,7 @@
@@ -7080,7 +7258,7 @@
// preventDefault(). It will still raise the window if appropriate.
break;
}
@ -668,7 +668,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
window.focus();
aEvent.preventDefault();
break;
@@ -7951,6 +8129,7 @@
@@ -7981,6 +8159,7 @@
aWebProgress.isTopLevel
) {
this.mTab.setAttribute("busy", "true");
@ -676,7 +676,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
gBrowser._tabAttrModified(this.mTab, ["busy"]);
this.mTab._notselectedsinceload = !this.mTab.selected;
}
@@ -8924,7 +9103,7 @@ var TabContextMenu = {
@@ -8954,7 +9133,7 @@ var TabContextMenu = {
);
contextUnpinSelectedTabs.hidden =
!this.contextTab.pinned || !this.multiselected;
@ -685,7 +685,7 @@ index bfba253af3253a8cf547a5d69a1695651fc5c203..d4c7c37e06dc74cf0de3a10e6682f26a
// Move Tab items
let contextMoveTabOptions = document.getElementById(
"context_moveTabOptions"
@@ -9193,6 +9372,7 @@ var TabContextMenu = {
@@ -9223,6 +9402,7 @@ var TabContextMenu = {
telemetrySource: gBrowser.TabMetrics.METRIC_SOURCE.TAB_STRIP,
});
} else {