ZenBrowserMirrors/zen-desktop
1
0
Fork 1
mirror of https://github.com/zen-browser/desktop.git synced 2025-07-10 05:35:29 +02:00
Code Releases Wiki Activity

fix: Completed migrating to firefox 139, b=(no-bug), c=tabs, common, compact-mode, glance

Browse source
This commit is contained in:
Mr. M 2025-05-22 13:45:31 +02:00
parent b26da26192
commit 9eb0aa0de4
No known key found for this signature in database
GPG key ID: 6292C4C8F8652B18
32 changed files with 193 additions and 368 deletions
Download patch file Download diff file Expand all files Collapse all files

126
src/browser/components/tabbrowser/content/tabbrowser-js.patch
View file

@ -1,13 +1,13 @@
diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f255c4ebc9 100644
index d5aa64842a35c6697263c63fd3a0571b64b01344..7e9aa77a5ea59b9002c7ce4b88432247ecdebcfc 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -415,11 +415,45 @@
@@ -413,11 +413,45 @@
return this.tabContainer.visibleTabs;
}
+ zenInsertTabAtIndex(...args) {
+ return this.#insertTabAtElementIndex(...args);
+ return this.#insertTabAtIndex(...args);
+ }
+
+ get _numVisiblePinTabsWithoutCollapsed() {
@ -50,7 +50,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
}
return i;
}
@@ -571,6 +605,7 @@
@@ -569,6 +603,7 @@
this.tabpanels.appendChild(panel);
let tab = this.tabs[0];
@ -58,7 +58,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
tab.linkedPanel = uniqueId;
this._selectedTab = tab;
this._selectedBrowser = browser;
@@ -836,11 +871,13 @@
@@ -834,11 +869,13 @@
}
this.showTab(aTab);
@ -75,7 +75,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
this.moveTabTo(aTab, {
tabIndex: this.pinnedTabCount,
forceUngrouped: true,
@@ -857,12 +894,15 @@
@@ -855,12 +892,15 @@
}
if (this.tabContainer.verticalMode) {
@ -92,7 +92,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
});
} else {
this.moveTabTo(aTab, {
@@ -1046,6 +1086,8 @@
@@ -1044,6 +1084,8 @@
let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
@ -101,7 +101,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
if (
aIconURL &&
!aLoadingPrincipal &&
@@ -1056,6 +1098,9 @@
@@ -1054,6 +1096,9 @@
);
return;
}
@ -111,7 +111,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
let browser = this.getBrowserForTab(aTab);
browser.mIconURL = aIconURL;
@@ -1305,6 +1350,7 @@
@@ -1303,6 +1348,7 @@
if (!this._previewMode) {
newTab.recordTimeFromUnloadToReload();
newTab.updateLastAccessed();
@ -119,7 +119,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
oldTab.updateLastAccessed();
// if this is the foreground window, update the last-seen timestamps.
if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
@@ -1457,6 +1503,9 @@
@@ -1455,6 +1501,9 @@
}
let activeEl = document.activeElement;
@ -129,7 +129,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
// If focus is on the old tab, move it to the new tab.
if (activeEl == oldTab) {
newTab.focus();
@@ -1780,7 +1829,8 @@
@@ -1778,7 +1827,8 @@
}
_setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
@ -139,7 +139,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
return false;
}
@@ -1888,7 +1938,7 @@
@@ -1886,7 +1936,7 @@
newIndex = this.selectedTab._tPos + 1;
}
@ -148,7 +148,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
if (this.isTabGroupLabel(targetTab)) {
throw new Error(
"Replacing a tab group label with a tab is not supported"
@@ -2152,6 +2202,7 @@
@@ -2150,6 +2200,7 @@
uriIsAboutBlank,
userContextId,
skipLoad,
@ -156,7 +156,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
} = {}) {
let b = document.createXULElement("browser");
// Use the JSM global to create the permanentKey, so that if the
@@ -2225,8 +2276,7 @@
@@ -2223,8 +2274,7 @@
// we use a different attribute name for this?
b.setAttribute("name", name);
}
@ -166,7 +166,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
b.setAttribute("transparent", "true");
}
@@ -2391,7 +2441,7 @@
@@ -2389,7 +2439,7 @@
let panel = this.getPanel(browser);
let uniqueId = this._generateUniquePanelID();
@ -175,7 +175,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
aTab.linkedPanel = uniqueId;
// Inject the <browser> into the DOM if necessary.
@@ -2450,8 +2500,8 @@
@@ -2448,8 +2498,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) {
@ -186,7 +186,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
} else {
aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
}
@@ -2679,6 +2729,7 @@
@@ -2680,6 +2730,7 @@
schemelessInput,
hasValidUserGestureActivation = false,
textDirectiveUserActivation = false,
@ -194,7 +194,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
} = {}
) {
// all callers of addTab that pass a params object need to pass
@@ -2689,6 +2740,12 @@
@@ -2690,6 +2741,12 @@
);
}
@ -207,7 +207,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
if (!UserInteraction.running("browser.tabs.opening", window)) {
UserInteraction.start("browser.tabs.opening", "initting", window);
}
@@ -2752,6 +2809,16 @@
@@ -2753,6 +2810,16 @@
noInitialLabel,
skipBackgroundNotify,
});
@ -224,7 +224,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
if (insertTab) {
// Insert the tab into the tab container in the correct position.
// For now, we support `index` as an alias for `tabIndex`.
@@ -2779,6 +2846,7 @@
@@ -2783,6 +2850,7 @@
openWindowInfo,
skipLoad,
triggeringRemoteType,
@ -232,7 +232,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
}));
if (focusUrlBar) {
@@ -2898,6 +2966,12 @@
@@ -2902,6 +2970,12 @@
}
}
@ -245,7 +245,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
// Additionally send pinned tab events
if (pinned) {
this._notifyPinnedStatus(t);
@@ -2993,10 +3070,10 @@
@@ -2990,10 +3064,10 @@
isAdoptingGroup = false,
isUserTriggered = false,
telemetryUserCreateSource = "unknown",
@ -257,7 +257,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
}
if (!color) {
@@ -3011,7 +3088,12 @@
@@ -3014,7 +3088,12 @@
label,
isAdoptingGroup
);
@ -271,7 +271,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
group,
insertBefore?.group ?? insertBefore
);
@@ -3342,6 +3424,7 @@
@@ -3303,6 +3382,7 @@
openWindowInfo,
skipLoad,
triggeringRemoteType,
@ -279,7 +279,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
}
) {
// If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
@@ -3411,6 +3494,7 @@
@@ -3372,6 +3452,7 @@
openWindowInfo,
name,
skipLoad,
@ -287,7 +287,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
});
}
@@ -3599,7 +3683,7 @@
@@ -3560,7 +3641,7 @@
// Add a new tab if needed.
if (!tab) {
let createLazyBrowser =
@ -296,7 +296,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
let url = "about:blank";
if (tabData.entries?.length) {
@@ -3637,7 +3721,29 @@
@@ -3598,7 +3679,29 @@
skipLoad: true,
preferredRemoteType,
});
@ -326,7 +326,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
if (select) {
tabToSelect = tab;
}
@@ -3661,7 +3767,8 @@
@@ -3622,7 +3725,8 @@
// needs calling:
shouldUpdateForPinnedTabs = true;
}
@ -336,7 +336,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
let { groupId } = tabData;
const tabGroup = tabGroupWorkingData.get(groupId);
// if a tab refers to a tab group we don't know, skip any group
@@ -3675,7 +3782,10 @@
@@ -3636,7 +3740,10 @@
tabGroup.stateData.id,
tabGroup.stateData.color,
tabGroup.stateData.collapsed,
@ -348,7 +348,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
);
tabsFragment.appendChild(tabGroup.node);
}
@@ -3723,8 +3833,16 @@
@@ -3684,8 +3791,16 @@
// to remove the old selected tab.
if (tabToSelect) {
let leftoverTab = this.selectedTab;
@ -367,7 +367,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
}
if (tabs.length > 1 || !tabs[0].selected) {
@@ -3912,7 +4030,7 @@
@@ -3881,7 +3996,7 @@
// Ensure we have an index if one was not provided.
if (typeof elementIndex != "number" && typeof tabIndex != "number") {
// Move the new tab after another tab if needed, to the end otherwise.
@ -376,7 +376,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
if (
!bulkOrderedOpen &&
((openerTab &&
@@ -3935,7 +4053,7 @@
@@ -3904,7 +4019,7 @@
) {
elementIndex = Infinity;
} else if (previousTab.visible) {
@ -385,8 +385,8 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
} else if (previousTab == FirefoxViewHandler.tab) {
elementIndex = 0;
}
@@ -3958,18 +4076,18 @@
@@ -3932,14 +4047,14 @@
}
// Ensure index is within bounds.
if (tab.pinned) {
- index = Math.max(index, 0);
@ -398,10 +398,14 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
+ index = Math.max(index, this._numVisiblePinTabsWithoutCollapsed);
index = Math.min(index, allItems.length);
}
/** @type {MozTabbrowserTab|undefined} */
- let itemAfter = allItems.at(index);
+ let itemAfter = allItems.filter(tab => !tab.hasAttribute("zen-glance-tab")).at(index);
// Prevent a flash of unstyled content by setting up the tab content
// and inherited attributes before appending it (see Bug 1592054):
@@ -3947,7 +4062,7 @@
this.tabContainer._invalidateCachedTabs();
- if (tabGroup) {
@ -409,7 +413,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
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);
@@ -4290,6 +4408,9 @@
@@ -4268,6 +4383,9 @@
return;
}
@ -419,7 +423,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
this.removeTabs(selectedTabs, { telemetrySource });
}
@@ -4542,6 +4663,7 @@
@@ -4520,6 +4638,7 @@
telemetrySource,
} = {}
) {
@ -427,7 +431,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
// When 'closeWindowWithLastTab' pref is enabled, closing all tabs
// can be considered equivalent to closing the window.
if (
@@ -4626,6 +4748,7 @@
@@ -4604,6 +4723,7 @@
if (lastToClose) {
this.removeTab(lastToClose, aParams);
}
@ -435,7 +439,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
} catch (e) {
console.error(e);
}
@@ -4663,6 +4786,12 @@
@@ -4641,6 +4761,12 @@
aTab._closeTimeNoAnimTimerId = Glean.browserTabclose.timeNoAnim.start();
}
@ -448,7 +452,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
// Handle requests for synchronously removing an already
// asynchronously closing tab.
if (!animate && aTab.closing) {
@@ -4677,7 +4806,9 @@
@@ -4655,7 +4781,9 @@
// frame created for it (for example, by updating the visually selected
// state).
let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@ -459,7 +463,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
if (
!this._beginRemoveTab(aTab, {
closeWindowFastpath: true,
@@ -4840,7 +4971,7 @@
@@ -4821,7 +4949,7 @@
closeWindowWithLastTab != null
? closeWindowWithLastTab
: !window.toolbar.visible ||
@ -468,7 +472,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
if (closeWindow) {
// We've already called beforeunload on all the relevant tabs if we get here,
@@ -4864,6 +4995,7 @@
@@ -4845,6 +4973,7 @@
newTab = true;
}
@ -476,7 +480,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
aTab._endRemoveArgs = [closeWindow, newTab];
// swapBrowsersAndCloseOther will take care of closing the window without animation.
@@ -4903,9 +5035,7 @@
@@ -4885,9 +5014,7 @@
aTab._mouseleave();
if (newTab) {
@ -487,7 +491,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
} else {
TabBarVisibility.update();
}
@@ -5034,6 +5164,8 @@
@@ -5016,6 +5143,8 @@
this.tabs[i]._tPos = i;
}
@ -496,7 +500,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
if (!this._windowIsClosing) {
if (wasPinned) {
this.tabContainer._positionPinnedTabs();
@@ -5159,8 +5291,8 @@
@@ -5141,8 +5270,8 @@
return closedCount;
}
@ -507,7 +511,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
if (unloadBlocked) {
return;
}
@@ -5248,6 +5380,7 @@
@@ -5230,6 +5359,7 @@
}
let excludeTabs = new Set(aExcludeTabs);
@ -515,7 +519,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
// If this tab has a successor, it should be selectable, since
// hiding or closing a tab removes that tab as a successor.
@@ -5260,13 +5393,13 @@
@@ -5242,13 +5372,13 @@
!excludeTabs.has(aTab.owner) &&
Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
) {
@ -531,7 +535,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
);
let tab = this.tabContainer.findNextTab(aTab, {
@@ -5282,7 +5415,7 @@
@@ -5264,7 +5394,7 @@
}
if (tab) {
@ -540,7 +544,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
}
// If no qualifying visible tab was found, see if there is a tab in
@@ -5303,7 +5436,7 @@
@@ -5285,7 +5415,7 @@
});
}
@ -549,7 +553,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
}
_blurTab(aTab) {
@@ -5704,10 +5837,10 @@
@@ -5686,10 +5816,10 @@
SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
}
@ -562,7 +566,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
aTab.selected ||
aTab.closing ||
// Tabs that are sharing the screen, microphone or camera cannot be hidden.
@@ -6001,7 +6134,7 @@
@@ -5986,7 +6116,7 @@
// Don't allow mixing pinned and unpinned tabs.
if (this.isTab(element) && element.pinned) {
@ -571,12 +575,12 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
} else {
tabIndex = Math.max(tabIndex, this.pinnedTabCount);
}
@@ -6027,10 +6160,16 @@
@@ -6012,10 +6142,16 @@
this.#handleTabMove(
element,
() => {
- let neighbor = this.tabs[tabIndex];
- if (forceUngrouped && neighbor.group) {
- if (forceUngrouped && neighbor?.group) {
+ let neighbor = gZenGlanceManager.getTabOrGlanceParent(this.tabs.filter(tab => !tab.hasAttribute("zen-glance-tab"))[tabIndex]);
+ if ((forceUngrouped && neighbor?.group) || neighbor?.group?.hasAttribute("split-view-group")) {
neighbor = neighbor.group;
@ -590,7 +594,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
if (neighbor && this.isTab(element) && tabIndex > element._tPos) {
neighbor.after(element);
} else {
@@ -6099,7 +6238,9 @@
@@ -6084,7 +6220,9 @@
targetElement = targetElement.group;
}
}
@ -601,7 +605,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
// Don't allow mixing pinned and unpinned tabs.
if (element.pinned && !targetElement?.pinned) {
targetElement = this.tabs[this.pinnedTabCount - 1];
@@ -6109,7 +6250,14 @@
@@ -6094,7 +6232,14 @@
moveBefore = true;
}
@ -616,7 +620,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
if (element.pinned && this.tabContainer.verticalMode) {
return this.tabContainer.verticalPinnedTabsContainer;
}
@@ -6169,7 +6317,7 @@
@@ -6154,7 +6299,7 @@
if (!this.isTab(aTab)) {
throw new Error("Can only move a tab into a tab group");
}
@ -625,7 +629,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
return;
}
if (aTab.group && aTab.group.id === aGroup.id) {
@@ -6263,6 +6411,10 @@
@@ -6248,6 +6393,10 @@
moveActionCallback();
@ -636,7 +640,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
// Clear tabs cache after moving nodes because the order of tabs may have
// changed.
this.tabContainer._invalidateCachedTabs();
@@ -7080,7 +7232,7 @@
@@ -7145,7 +7294,7 @@
// preventDefault(). It will still raise the window if appropriate.
break;
}
@ -645,7 +649,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
window.focus();
aEvent.preventDefault();
break;
@@ -7981,6 +8133,7 @@
@@ -8044,6 +8193,7 @@
aWebProgress.isTopLevel
) {
this.mTab.setAttribute("busy", "true");
@ -653,7 +657,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
gBrowser._tabAttrModified(this.mTab, ["busy"]);
this.mTab._notselectedsinceload = !this.mTab.selected;
}
@@ -8954,7 +9107,7 @@ var TabContextMenu = {
@@ -9009,7 +9159,7 @@ var TabContextMenu = {
);
contextUnpinSelectedTabs.hidden =
!this.contextTab.pinned || !this.multiselected;
@ -662,7 +666,7 @@ index 6dece2b9d0462d90a28e75350ce983d87816ef73..5c49c43714b3914130f8d821d902f9f2
// Move Tab items
let contextMoveTabOptions = document.getElementById(
"context_moveTabOptions"
@@ -9223,6 +9376,7 @@ var TabContextMenu = {
@@ -9278,6 +9428,7 @@ var TabContextMenu = {
telemetrySource: gBrowser.TabMetrics.METRIC_SOURCE.TAB_STRIP,
});
} else {