From 09ec1ad8646e13f29eaa59996ee68024da6d1653 Mon Sep 17 00:00:00 2001 From: "mr. m" Date: Tue, 22 Apr 2025 15:08:34 +0200 Subject: [PATCH] chore: Updated to ff 138.0 and recalculated patches, b=(no-bug), c=tabs, media --- .vscode/settings.json | 3 +- src/Cargo-lock.patch | 4 +- src/browser/actors/WebRTCParent-sys-mjs.patch | 2 +- src/browser/app/profile/firefox-js.patch | 4 +- src/browser/base/content/browser-js.patch | 8 +- .../base/content/nsContextMenu-sys-mjs.patch | 4 +- src/browser/base/jar-mn.patch | 4 +- .../BrowserContentHandler-sys-mjs.patch | 2 +- .../ToolbarContextMenu-sys-mjs.patch | 2 +- .../customizableui/content/panelUI-js.patch | 4 +- .../places/PlacesUIUtils-sys-mjs.patch | 14 +-- .../components/preferences/main-js.patch | 4 +- .../preferences/preferences-js.patch | 2 +- .../search/SearchOneOffs-sys-mjs.patch | 4 +- .../sessionstore/SessionStore-sys-mjs.patch | 14 +-- .../tabbrowser/content/tabbrowser-js.patch | 118 +++++++++--------- .../urlbar/UrlbarInput-sys-mjs.patch | 36 +++--- .../urlbar/UrlbarView-sys-mjs.patch | 4 +- .../newtab/lib/AboutPreferences-sys-mjs.patch | 4 +- .../newtab/lib/ActivityStream-sys-mjs.patch | 4 +- .../installer/windows/nsis/shared-nsh.patch | 11 +- .../modules/URILoadingHelper-sys-mjs.patch | 4 +- .../themes/BuiltInThemeConfig-sys-mjs.patch | 2 +- .../themes/shared/tabbrowser/tabs-css.patch | 2 +- .../startup/DevToolsStartup-sys-mjs.patch | 4 +- src/dom/base/use_counter_metrics-yaml.patch | 6 +- src/dom/script/ScriptLoader-cpp.patch | 4 +- src/layout/generic/nsIFrame-cpp.patch | 4 +- src/layout/style/nsStyleStruct-h.patch | 4 +- .../libpref/init/StaticPrefList-yaml.patch | 4 +- src/netwerk/protocol/http/moz-build.patch | 4 +- .../style/gecko/media_features-rs.patch | 8 +- .../content/aboutProcesses-html.patch | 2 +- .../PictureInPicture-sys-mjs.patch | 6 +- .../content/widgets/arrowscrollbox-js.patch | 2 +- src/toolkit/content/widgets/tabbox-js.patch | 8 +- src/toolkit/modules/moz-build.patch | 4 +- src/toolkit/moz-configure.patch | 2 +- .../extensions/AddonManager-sys-mjs.patch | 2 +- .../extensions/content/aboutaddons-html.patch | 4 +- .../internal/XPIDatabase-sys-mjs.patch | 6 +- .../profile/nsToolkitProfileService-cpp.patch | 4 +- .../themes/shared/aboutReader-css.patch | 4 +- src/widget/gtk/nsAppShell-cpp.patch | 4 +- 44 files changed, 178 insertions(+), 168 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index a71c154e..00aaa390 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -26,5 +26,6 @@ "system_error": "cpp", "regex": "cpp", "type_traits": "cpp" - } + }, + "git.ignoreLimitWarning": true } diff --git a/src/Cargo-lock.patch b/src/Cargo-lock.patch index 42f5a389..14a1afd6 100644 --- a/src/Cargo-lock.patch +++ b/src/Cargo-lock.patch @@ -1,8 +1,8 @@ diff --git a/Cargo.lock b/Cargo.lock -index c91f39b3afbe712355194593ae39514a83de6605..e6c2b77a69d9274ff1c7578ab4df4f07533f7441 100644 +index 38508fffccbce801a02d4a4211f368674307c4d3..5ce56c36da2e242ad81621c2032eb68dcd26e960 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -3850,8 +3850,6 @@ dependencies = [ +@@ -3931,8 +3931,6 @@ dependencies = [ [[package]] name = "mime_guess" version = "2.0.4" diff --git a/src/browser/actors/WebRTCParent-sys-mjs.patch b/src/browser/actors/WebRTCParent-sys-mjs.patch index 57c3a0c1..19e78d20 100644 --- a/src/browser/actors/WebRTCParent-sys-mjs.patch +++ b/src/browser/actors/WebRTCParent-sys-mjs.patch @@ -1,5 +1,5 @@ diff --git a/browser/actors/WebRTCParent.sys.mjs b/browser/actors/WebRTCParent.sys.mjs -index be66de4a1ef044341c2e1d6953806550897df45a..ff6ef3511076b25e00ca4d0189f666ec7aa94fe8 100644 +index 40e3a057a1d4b2f9bcfb73fa5ff96b2555865434..a92bed06766dd930bd336d56cd9ddcf3c6c0eeca 100644 --- a/browser/actors/WebRTCParent.sys.mjs +++ b/browser/actors/WebRTCParent.sys.mjs @@ -152,6 +152,7 @@ export class WebRTCParent extends JSWindowActorParent { diff --git a/src/browser/app/profile/firefox-js.patch b/src/browser/app/profile/firefox-js.patch index 0f2aa228..0e4c999d 100644 --- a/src/browser/app/profile/firefox-js.patch +++ b/src/browser/app/profile/firefox-js.patch @@ -1,8 +1,8 @@ diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 78572e5480a6137c5b7de89c489956f5d68ef698..1c72fe9a5419e211dea25271113981aeda46ec66 100644 +index 89b8b830e8f53582dd9910b0172098d31a8d8967..51bdc847823cb95f811b7e9d2d864b9aacf0e364 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -3363,3 +3363,5 @@ pref("toolkit.contentRelevancy.enabled", false); +@@ -3375,3 +3375,5 @@ pref("toolkit.contentRelevancy.enabled", false); pref("toolkit.contentRelevancy.ingestEnabled", false); // Pref to enable extra logging for the content relevancy feature pref("toolkit.contentRelevancy.log", false); diff --git a/src/browser/base/content/browser-js.patch b/src/browser/base/content/browser-js.patch index 97f85112..19369c28 100644 --- a/src/browser/base/content/browser-js.patch +++ b/src/browser/base/content/browser-js.patch @@ -1,5 +1,5 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js -index b89846a1103827b7e65c0b6c9197e80761e3f5c0..cc7205765244738743db92bfcafc1f288919ae0d 100644 +index ea79d296e7dd0f8fd812b0677a252af5cf7ad26e..bd95ef5d6b99399c859af1cf71d9d62477f4ac2b 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -33,6 +33,7 @@ ChromeUtils.defineESModuleGetters(this, { @@ -10,7 +10,7 @@ index b89846a1103827b7e65c0b6c9197e80761e3f5c0..cc7205765244738743db92bfcafc1f28 DevToolsSocketStatus: "resource://devtools/shared/security/DevToolsSocketStatus.sys.mjs", DownloadUtils: "resource://gre/modules/DownloadUtils.sys.mjs", -@@ -2698,6 +2699,11 @@ var XULBrowserWindow = { +@@ -2338,6 +2339,11 @@ var XULBrowserWindow = { AboutReaderParent.updateReaderButton(gBrowser.selectedBrowser); TranslationsParent.onLocationChange(gBrowser.selectedBrowser); @@ -22,7 +22,7 @@ index b89846a1103827b7e65c0b6c9197e80761e3f5c0..cc7205765244738743db92bfcafc1f28 PictureInPicture.updateUrlbarToggle(gBrowser.selectedBrowser); if (!gMultiProcessBrowser) { -@@ -5194,7 +5200,7 @@ function switchToTabHavingURI( +@@ -4814,7 +4820,7 @@ function switchToTabHavingURI( ignoreQueryString || replaceQueryString, ignoreFragmentWhenComparing ); @@ -31,7 +31,7 @@ index b89846a1103827b7e65c0b6c9197e80761e3f5c0..cc7205765244738743db92bfcafc1f28 for (let i = 0; i < browsers.length; i++) { let browser = browsers[i]; let browserCompare = cleanURL( -@@ -5235,7 +5241,7 @@ function switchToTabHavingURI( +@@ -4857,7 +4863,7 @@ function switchToTabHavingURI( } if (!doAdopt) { diff --git a/src/browser/base/content/nsContextMenu-sys-mjs.patch b/src/browser/base/content/nsContextMenu-sys-mjs.patch index 54f4a4af..4ed3e084 100644 --- a/src/browser/base/content/nsContextMenu-sys-mjs.patch +++ b/src/browser/base/content/nsContextMenu-sys-mjs.patch @@ -1,8 +1,8 @@ diff --git a/browser/base/content/nsContextMenu.sys.mjs b/browser/base/content/nsContextMenu.sys.mjs -index 94d3c2bb401c2e4246340a6c2d63c9d3561ff5e1..62c599f78748e708c8f36c05935822e8808996b5 100644 +index 3bd0ee8af8b696161d18fd2a978f9e25972ed3ad..2f0763dbde2250f625e9a87ab88910b4421c36ca 100644 --- a/browser/base/content/nsContextMenu.sys.mjs +++ b/browser/base/content/nsContextMenu.sys.mjs -@@ -1109,6 +1109,13 @@ export class nsContextMenu { +@@ -1111,6 +1111,13 @@ export class nsContextMenu { !this.isSecureAboutPage() ); diff --git a/src/browser/base/jar-mn.patch b/src/browser/base/jar-mn.patch index 9f95a0a0..2816f605 100644 --- a/src/browser/base/jar-mn.patch +++ b/src/browser/base/jar-mn.patch @@ -1,8 +1,8 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn -index 824c5df20ee13af7af2ce8657506f6f3f457aafc..6ef49535676325768497c1804f91c9e93959199a 100644 +index 4401c78d34007fa7481f8b8eeb070d17110821ae..064f14a7adf4ce1b98d58302998272444466c3ee 100644 --- a/browser/base/jar.mn +++ b/browser/base/jar.mn -@@ -103,3 +103,5 @@ browser.jar: +@@ -105,3 +105,5 @@ browser.jar: # L10n resources and overrides. % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties diff --git a/src/browser/components/BrowserContentHandler-sys-mjs.patch b/src/browser/components/BrowserContentHandler-sys-mjs.patch index 1f61d29a..79c5fbf5 100644 --- a/src/browser/components/BrowserContentHandler-sys-mjs.patch +++ b/src/browser/components/BrowserContentHandler-sys-mjs.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/BrowserContentHandler.sys.mjs b/browser/components/BrowserContentHandler.sys.mjs -index 7747d90981aea9437bf2d9cf46ec17be0b9ad64c..656d640da0efeb59a4037bb450e0cb1f69dda0ba 100644 +index 5911b276fdc9889d3cb61bac3d302ec5239e4a90..a405f8a0204e98fa9de08f1cd7b6761f0fc6198e 100644 --- a/browser/components/BrowserContentHandler.sys.mjs +++ b/browser/components/BrowserContentHandler.sys.mjs @@ -1270,6 +1270,7 @@ function maybeRecordToHandleTelemetry(uri, isLaunch) { diff --git a/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch b/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch index 3e218915..292753df 100644 --- a/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch +++ b/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/customizableui/ToolbarContextMenu.sys.mjs b/browser/components/customizableui/ToolbarContextMenu.sys.mjs -index af22f766a052372a68faca139161cccbf0d768f0..199591ca0609e8902e84a87baf50acc29f84ee3a 100644 +index b88b0166fb99bc3d44a2e05798650b8ad6ab9a46..2e66c8294f0ef4f91ae160bd55b7417b55e9f5b2 100644 --- a/browser/components/customizableui/ToolbarContextMenu.sys.mjs +++ b/browser/components/customizableui/ToolbarContextMenu.sys.mjs @@ -240,8 +240,8 @@ export var ToolbarContextMenu = { diff --git a/src/browser/components/customizableui/content/panelUI-js.patch b/src/browser/components/customizableui/content/panelUI-js.patch index 651f80f9..200210b9 100644 --- a/src/browser/components/customizableui/content/panelUI-js.patch +++ b/src/browser/components/customizableui/content/panelUI-js.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js -index 010d0813557efd6d5a3a84ea589989f6e9ff195a..e26cc1be1f56919e6ec5f2432854b284837671ac 100644 +index ec52437dba30633a374299a46c856e1df05dec0e..48617e32d56c3b3f525557ddeac6297555c48c04 100644 --- a/browser/components/customizableui/content/panelUI.js +++ b/browser/components/customizableui/content/panelUI.js @@ -515,8 +515,7 @@ const PanelUI = { @@ -12,7 +12,7 @@ index 010d0813557efd6d5a3a84ea589989f6e9ff195a..e26cc1be1f56919e6ec5f2432854b284 .appendChild(tempPanel); let multiView = document.createXULElement("panelmultiview"); -@@ -960,7 +959,7 @@ const PanelUI = { +@@ -957,7 +956,7 @@ const PanelUI = { el.removeAttribute("data-lazy-l10n-id"); }); diff --git a/src/browser/components/places/PlacesUIUtils-sys-mjs.patch b/src/browser/components/places/PlacesUIUtils-sys-mjs.patch index 19b4f1ce..78266e8c 100644 --- a/src/browser/components/places/PlacesUIUtils-sys-mjs.patch +++ b/src/browser/components/places/PlacesUIUtils-sys-mjs.patch @@ -1,8 +1,8 @@ diff --git a/browser/components/places/PlacesUIUtils.sys.mjs b/browser/components/places/PlacesUIUtils.sys.mjs -index fbdd6a34b12d4d957f7a2d9d95df0bfd65ba3f61..baaf34536f557c69fce3cc43e6f12658514db39f 100644 +index 1f5e163bae58f3f1cac750ca32846cc8a80bd2ca..16034842b4ca5295aa3c9237db55035ecc4016d2 100644 --- a/browser/components/places/PlacesUIUtils.sys.mjs +++ b/browser/components/places/PlacesUIUtils.sys.mjs -@@ -58,6 +58,7 @@ class BookmarkState { +@@ -59,6 +59,7 @@ class BookmarkState { info, tags = "", keyword = "", @@ -10,7 +10,7 @@ index fbdd6a34b12d4d957f7a2d9d95df0bfd65ba3f61..baaf34536f557c69fce3cc43e6f12658 isFolder = false, children = [], autosave = false, -@@ -82,12 +83,18 @@ class BookmarkState { +@@ -83,12 +84,18 @@ class BookmarkState { keyword, parentGuid: info.parentGuid, index, @@ -29,7 +29,7 @@ index fbdd6a34b12d4d957f7a2d9d95df0bfd65ba3f61..baaf34536f557c69fce3cc43e6f12658 /** * Save edited title for the bookmark * -@@ -181,6 +188,14 @@ class BookmarkState { +@@ -182,6 +189,14 @@ class BookmarkState { "BookmarkState::createBookmark" ); this._guid = results?.[0]; @@ -44,7 +44,7 @@ index fbdd6a34b12d4d957f7a2d9d95df0bfd65ba3f61..baaf34536f557c69fce3cc43e6f12658 return this._guid; } -@@ -214,6 +229,14 @@ class BookmarkState { +@@ -215,6 +230,14 @@ class BookmarkState { "BookmarkState::save::createFolder" ); this._guid = results[0]; @@ -59,7 +59,7 @@ index fbdd6a34b12d4d957f7a2d9d95df0bfd65ba3f61..baaf34536f557c69fce3cc43e6f12658 return this._guid; } -@@ -300,11 +323,97 @@ class BookmarkState { +@@ -301,11 +324,97 @@ class BookmarkState { await lazy.PlacesTransactions.batch(transactions, "BookmarkState::save"); } @@ -157,7 +157,7 @@ index fbdd6a34b12d4d957f7a2d9d95df0bfd65ba3f61..baaf34536f557c69fce3cc43e6f12658 /** * Append transactions to update tags by given information. * -@@ -902,8 +1011,15 @@ export var PlacesUIUtils = { +@@ -903,8 +1012,15 @@ export var PlacesUIUtils = { aNode, aWhere, aWindow, diff --git a/src/browser/components/preferences/main-js.patch b/src/browser/components/preferences/main-js.patch index 9676a310..dbd48ac0 100644 --- a/src/browser/components/preferences/main-js.patch +++ b/src/browser/components/preferences/main-js.patch @@ -1,8 +1,8 @@ diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js -index 8f6f78419a0876ebe6d0967a88ef03e464dbbd23..9339085014b797033c4ee1ed2e40f2506d1e9797 100644 +index aa339be9ba94ed776fa25f2d72f9e6b25dc86cd3..4c6c725942b3d6f2a42938d444ac7645526623cc 100644 --- a/browser/components/preferences/main.js +++ b/browser/components/preferences/main.js -@@ -218,7 +218,7 @@ function getBundleForLocales(newLocales) { +@@ -389,7 +389,7 @@ function getBundleForLocales(newLocales) { ]) ); return new Localization( diff --git a/src/browser/components/preferences/preferences-js.patch b/src/browser/components/preferences/preferences-js.patch index e4336e5c..d8e56204 100644 --- a/src/browser/components/preferences/preferences-js.patch +++ b/src/browser/components/preferences/preferences-js.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js -index 6386773b287ca6d06a0abe928850c5bb465828ed..b3459a2abcac5f21a5b24189ec1dc88e24626687 100644 +index e4746e3408e68273126e6d2baf5afcf80721674b..e478aaf6bfefa6acd9062aeb3e4709ca0d5d779c 100644 --- a/browser/components/preferences/preferences.js +++ b/browser/components/preferences/preferences.js @@ -118,6 +118,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () { diff --git a/src/browser/components/search/SearchOneOffs-sys-mjs.patch b/src/browser/components/search/SearchOneOffs-sys-mjs.patch index b6c19086..c8c9e827 100644 --- a/src/browser/components/search/SearchOneOffs-sys-mjs.patch +++ b/src/browser/components/search/SearchOneOffs-sys-mjs.patch @@ -1,8 +1,8 @@ diff --git a/browser/components/search/SearchOneOffs.sys.mjs b/browser/components/search/SearchOneOffs.sys.mjs -index 4810eca0825f9a6f07f242e804de2edb7bd697d8..fd4e7661c93be528c2766e27fe22403d3d495292 100644 +index c1f8fd1225cfc47c2e171361aa6069d3cbaf3afb..b32a2cf621022a500a2efc7777b4379347dcf353 100644 --- a/browser/components/search/SearchOneOffs.sys.mjs +++ b/browser/components/search/SearchOneOffs.sys.mjs -@@ -443,7 +443,7 @@ export class SearchOneOffs { +@@ -444,7 +444,7 @@ export class SearchOneOffs { // For the search-bar, always show the one-off buttons where there is an // option to add an engine. let addEngineNeeded = isSearchBar && addEngines.length; diff --git a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch index cbcbad06..0e095b55 100644 --- a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch +++ b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch @@ -1,8 +1,8 @@ diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs -index 6e2973abf428b110bfc553522723f327ee84c028..cf707b1aace542b4b42468bbaaffd047669c8c94 100644 +index 5633e5032f5d50c70512187d27e045b579978927..7604adcd38308c38c7c62d16aa29c860a7726649 100644 --- a/browser/components/sessionstore/SessionStore.sys.mjs +++ b/browser/components/sessionstore/SessionStore.sys.mjs -@@ -3186,7 +3186,7 @@ var SessionStoreInternal = { +@@ -3202,7 +3202,7 @@ var SessionStoreInternal = { if (!isPrivateWindow && tabState.isPrivate) { return; } @@ -11,7 +11,7 @@ index 6e2973abf428b110bfc553522723f327ee84c028..cf707b1aace542b4b42468bbaaffd047 return; } -@@ -3895,6 +3895,8 @@ var SessionStoreInternal = { +@@ -3911,6 +3911,8 @@ var SessionStoreInternal = { Math.min(tabState.index, tabState.entries.length) ); tabState.pinned = false; @@ -20,7 +20,7 @@ index 6e2973abf428b110bfc553522723f327ee84c028..cf707b1aace542b4b42468bbaaffd047 if (inBackground === false) { aWindow.gBrowser.selectedTab = newTab; -@@ -5399,14 +5401,15 @@ var SessionStoreInternal = { +@@ -5416,14 +5418,15 @@ var SessionStoreInternal = { } let tabbrowser = aWindow.gBrowser; @@ -38,7 +38,7 @@ index 6e2973abf428b110bfc553522723f327ee84c028..cf707b1aace542b4b42468bbaaffd047 continue; } let tabData = lazy.TabState.collect(tab, TAB_CUSTOM_VALUES.get(tab)); -@@ -5425,7 +5428,7 @@ var SessionStoreInternal = { +@@ -5442,7 +5445,7 @@ var SessionStoreInternal = { // We don't store the Firefox View tab in Session Store, so if it was the last selected "tab" when // 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). @@ -47,7 +47,7 @@ index 6e2973abf428b110bfc553522723f327ee84c028..cf707b1aace542b4b42468bbaaffd047 selectedIndex = 1; winData.title = tabbrowser.tabs[0].label; } -@@ -5582,6 +5585,7 @@ var SessionStoreInternal = { +@@ -5599,6 +5602,7 @@ var SessionStoreInternal = { winData.tabs, winData.groups ?? [] ); @@ -55,7 +55,7 @@ index 6e2973abf428b110bfc553522723f327ee84c028..cf707b1aace542b4b42468bbaaffd047 this._log.debug( `restoreWindow, createTabsForSessionRestore returned ${tabs.length} tabs` ); -@@ -6130,8 +6134,23 @@ var SessionStoreInternal = { +@@ -6148,8 +6152,23 @@ var SessionStoreInternal = { // Most of tabData has been restored, now continue with restoring // attributes that may trigger external events. diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch index 41c92387..d862d5e4 100644 --- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch +++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch @@ -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 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 { diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch index a9e4c7bb..1e07f3ef 100644 --- a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch +++ b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch @@ -1,8 +1,8 @@ diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs -index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862f1d17b8d 100644 +index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..100f96cb58499dbae490b3772effef0f79aec75b 100644 --- a/browser/components/urlbar/UrlbarInput.sys.mjs +++ b/browser/components/urlbar/UrlbarInput.sys.mjs -@@ -67,6 +67,13 @@ XPCOMUtils.defineLazyPreferenceGetter( +@@ -68,6 +68,13 @@ XPCOMUtils.defineLazyPreferenceGetter( false ); @@ -16,7 +16,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862 const DEFAULT_FORM_HISTORY_NAME = "searchbar-history"; const SEARCH_BUTTON_CLASS = "urlbar-search-button"; -@@ -348,7 +355,11 @@ export class UrlbarInput { +@@ -349,7 +356,11 @@ export class UrlbarInput { // See _on_select(). HTMLInputElement.select() dispatches a "select" // event but does not set the primary selection. this._suppressPrimaryAdjustment = true; @@ -28,7 +28,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862 this._suppressPrimaryAdjustment = false; } -@@ -424,6 +435,10 @@ export class UrlbarInput { +@@ -425,6 +436,10 @@ export class UrlbarInput { hideSearchTerms = false, isSameDocument = false ) { @@ -39,7 +39,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862 // We only need to update the searchModeUI on tab switch conditionally // as we only persist searchMode with ScotchBonnet enabled. if ( -@@ -697,8 +712,11 @@ export class UrlbarInput { +@@ -698,8 +713,11 @@ export class UrlbarInput { return; } } @@ -52,7 +52,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862 } /** -@@ -1092,7 +1110,11 @@ export class UrlbarInput { +@@ -1093,7 +1111,11 @@ export class UrlbarInput { } if (!this.#providesSearchMode(result)) { @@ -65,7 +65,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862 } this.controller.recordSelectedResult(event, result); -@@ -2124,6 +2146,10 @@ export class UrlbarInput { +@@ -2125,6 +2147,10 @@ export class UrlbarInput { await this.#updateLayoutBreakoutDimensions(); } @@ -76,7 +76,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862 startLayoutExtend() { if (!this.#allowBreakout || this.hasAttribute("breakout-extend")) { // Do not expand if the Urlbar does not support being expanded or it is -@@ -2146,6 +2172,11 @@ export class UrlbarInput { +@@ -2147,6 +2173,11 @@ export class UrlbarInput { this.setAttribute("breakout-extend", "true"); @@ -88,7 +88,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862 // Enable the animation only after the first extend call to ensure it // doesn't run when opening a new window. if (!this.hasAttribute("breakout-extend-animate")) { -@@ -2165,6 +2196,19 @@ export class UrlbarInput { +@@ -2166,6 +2197,19 @@ export class UrlbarInput { return; } @@ -108,7 +108,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862 this.removeAttribute("breakout-extend"); this.#updateTextboxPosition(); } -@@ -2997,7 +3041,7 @@ export class UrlbarInput { +@@ -2998,7 +3042,7 @@ export class UrlbarInput { */ _trimValue(val) { let trimmedValue = lazy.UrlbarPrefs.get("trimURLs") @@ -117,7 +117,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862 : val; // Only trim value if the directionality doesn't change to RTL and we're not // showing a strikeout https protocol. -@@ -3367,6 +3411,10 @@ export class UrlbarInput { +@@ -3368,6 +3412,10 @@ export class UrlbarInput { } reuseEmpty = true; } @@ -128,7 +128,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862 if ( where == "tab" && reuseEmpty && -@@ -3374,6 +3422,9 @@ export class UrlbarInput { +@@ -3375,6 +3423,9 @@ export class UrlbarInput { ) { where = "current"; } @@ -138,7 +138,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862 return where; } -@@ -3625,7 +3676,7 @@ export class UrlbarInput { +@@ -3626,7 +3677,7 @@ export class UrlbarInput { pasteAndGo.setAttribute("anonid", "paste-and-go"); pasteAndGo.addEventListener("command", () => { this._suppressStartQuery = true; @@ -147,7 +147,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862 this.select(); this.window.goDoCommand("cmd_paste"); this.setResultForCurrentValue(null); -@@ -3638,7 +3689,6 @@ export class UrlbarInput { +@@ -3639,7 +3690,6 @@ export class UrlbarInput { contextMenu.addEventListener("popupshowing", () => { // Close the results pane when the input field contextual menu is open, // because paste and go doesn't want a result selection. @@ -155,7 +155,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862 let controller = this.document.commandDispatcher.getControllerForCommand("cmd_paste"); -@@ -4048,6 +4098,11 @@ export class UrlbarInput { +@@ -4053,6 +4103,11 @@ export class UrlbarInput { } _on_click(event) { @@ -167,7 +167,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862 if ( event.target == this.inputField || event.target == this._inputContainer || -@@ -4119,7 +4174,7 @@ export class UrlbarInput { +@@ -4124,7 +4179,7 @@ export class UrlbarInput { } } @@ -176,7 +176,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862 this.view.autoOpen({ event }); } else { if (this._untrimOnFocusAfterKeydown) { -@@ -4159,9 +4214,12 @@ export class UrlbarInput { +@@ -4164,9 +4219,12 @@ export class UrlbarInput { } _on_mousedown(event) { @@ -190,7 +190,7 @@ index 6de4c2ac873b1424abee118a143ac377f26beb80..23b4d238d767000b9f0de74cfc13c862 if ( event.target != this.inputField && -@@ -4171,8 +4229,8 @@ export class UrlbarInput { +@@ -4176,8 +4234,8 @@ export class UrlbarInput { break; } diff --git a/src/browser/components/urlbar/UrlbarView-sys-mjs.patch b/src/browser/components/urlbar/UrlbarView-sys-mjs.patch index 4dc2dbf4..ab4d4c67 100644 --- a/src/browser/components/urlbar/UrlbarView-sys-mjs.patch +++ b/src/browser/components/urlbar/UrlbarView-sys-mjs.patch @@ -1,8 +1,8 @@ diff --git a/browser/components/urlbar/UrlbarView.sys.mjs b/browser/components/urlbar/UrlbarView.sys.mjs -index 0e6724f590490354cc4d4bde5176556f7e4b4a7c..bffc52488443d62de46abe5cbdac4504831c4a09 100644 +index d5382623595de8daed8cd13ea2eb2de329a4bd92..8e160e0bb5a1cd626753feba2008a24e3bbd84cd 100644 --- a/browser/components/urlbar/UrlbarView.sys.mjs +++ b/browser/components/urlbar/UrlbarView.sys.mjs -@@ -610,7 +610,7 @@ export class UrlbarView { +@@ -609,7 +609,7 @@ export class UrlbarView { !this.input.value || this.input.getAttribute("pageproxystate") == "valid" ) { diff --git a/src/browser/extensions/newtab/lib/AboutPreferences-sys-mjs.patch b/src/browser/extensions/newtab/lib/AboutPreferences-sys-mjs.patch index 20ee3686..934cfd2d 100644 --- a/src/browser/extensions/newtab/lib/AboutPreferences-sys-mjs.patch +++ b/src/browser/extensions/newtab/lib/AboutPreferences-sys-mjs.patch @@ -1,8 +1,8 @@ diff --git a/browser/extensions/newtab/lib/AboutPreferences.sys.mjs b/browser/extensions/newtab/lib/AboutPreferences.sys.mjs -index df9d63c2713b4237d8acca93f108d5c788caed8d..a80cc02fdec6e1056d26a6b5a1cdc1a602e5cf2a 100644 +index a325becabddda511204fc5bd2022edc332cdde7c..6bb29b21f1e6c1d6ea3d38d50f01148e0a51f0d7 100644 --- a/browser/extensions/newtab/lib/AboutPreferences.sys.mjs +++ b/browser/extensions/newtab/lib/AboutPreferences.sys.mjs -@@ -34,7 +34,7 @@ const PREFS_BEFORE_SECTIONS = () => [ +@@ -52,7 +52,7 @@ const PREFS_BEFORE_SECTIONS = () => [ titleString: "home-prefs-shortcuts-header", descString: "home-prefs-shortcuts-description", get nestedPrefs() { diff --git a/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch b/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch index 12351614..86da5628 100644 --- a/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch +++ b/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch @@ -1,8 +1,8 @@ diff --git a/browser/extensions/newtab/lib/ActivityStream.sys.mjs b/browser/extensions/newtab/lib/ActivityStream.sys.mjs -index b3d89213ec27151f05e9990d5a55c6e81ce3655f..3c485f616fa2daba62aacbdde2dfb3122e244821 100644 +index 14183ad7165dc91126b4409b26f669409c4e9905..be979225b89b193b9e9c8903de5740dc04a8999f 100644 --- a/browser/extensions/newtab/lib/ActivityStream.sys.mjs +++ b/browser/extensions/newtab/lib/ActivityStream.sys.mjs -@@ -214,7 +214,7 @@ export const PREFS_CONFIG = new Map([ +@@ -215,7 +215,7 @@ export const PREFS_CONFIG = new Map([ "showSponsoredTopSites", { title: "Show sponsored top sites", diff --git a/src/browser/installer/windows/nsis/shared-nsh.patch b/src/browser/installer/windows/nsis/shared-nsh.patch index 09a2396f..bf8242d2 100644 --- a/src/browser/installer/windows/nsis/shared-nsh.patch +++ b/src/browser/installer/windows/nsis/shared-nsh.patch @@ -1,7 +1,7 @@ diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh old mode 100755 new mode 100644 -index bc8f5775785e08a0cc1c8a6ad1f0e19e980c607d..bf11d30d10fb38855f6a0e8d5346be271042769e +index bc8f5775785e08a0cc1c8a6ad1f0e19e980c607d..f45dd4d2b0623a4502bf63dd4e580faa674bd2bb --- a/browser/installer/windows/nsis/shared.nsh +++ b/browser/installer/windows/nsis/shared.nsh @@ -513,6 +513,7 @@ ${RemoveDefaultBrowserAgentShortcut} @@ -28,6 +28,15 @@ index bc8f5775785e08a0cc1c8a6ad1f0e19e980c607d..bf11d30d10fb38855f6a0e8d5346be27 ${WriteApplicationsSupportedType} ${RegKey} ".xht" ${WriteApplicationsSupportedType} ${RegKey} ".xhtml" ${WriteApplicationsSupportedType} ${RegKey} ".xml" +@@ -878,7 +881,7 @@ ${RemoveDefaultBrowserAgentShortcut} + ${WriteRegStr2} $1 "$0" "DisplayVersion" "${AppVersion}" 0 + ${WriteRegStr2} $1 "$0" "HelpLink" "${HelpLink}" 0 + ${WriteRegStr2} $1 "$0" "InstallLocation" "$8" 0 +- ${WriteRegStr2} $1 "$0" "Publisher" "Mozilla" 0 ++ ${WriteRegStr2} $1 "$0" "Publisher" "Zen OSS Team" 0 + ${WriteRegStr2} $1 "$0" "UninstallString" "$\"$8\uninstall\helper.exe$\"" 0 + DeleteRegValue SHCTX "$0" "URLInfoAbout" + ; Don't add URLUpdateInfo which is the release notes url except for the release @@ -1727,6 +1730,8 @@ Function SetAsDefaultAppUserHKCU Pop $0 AppAssocReg::SetAppAsDefault "$R9" ".avif" "file" diff --git a/src/browser/modules/URILoadingHelper-sys-mjs.patch b/src/browser/modules/URILoadingHelper-sys-mjs.patch index f3f4be2d..0310708b 100644 --- a/src/browser/modules/URILoadingHelper-sys-mjs.patch +++ b/src/browser/modules/URILoadingHelper-sys-mjs.patch @@ -1,8 +1,8 @@ diff --git a/browser/modules/URILoadingHelper.sys.mjs b/browser/modules/URILoadingHelper.sys.mjs -index c4428df9e1c43ba7a1dfefa2d55316023325d2db..191bc513862d5247e338c683b11ae891ab914479 100644 +index 14bf18132eaee8a0c8fe6e108ac423de91a7d3e2..fa616654fdf8a29d59889227780a98f0f9dc9a20 100644 --- a/browser/modules/URILoadingHelper.sys.mjs +++ b/browser/modules/URILoadingHelper.sys.mjs -@@ -510,7 +510,7 @@ export const URILoadingHelper = { +@@ -516,7 +516,7 @@ export const URILoadingHelper = { // page. If a load request bounces off for the currently selected tab, // we'll open a new tab instead. let tab = w.gBrowser.getTabForBrowser(targetBrowser); diff --git a/src/browser/themes/BuiltInThemeConfig-sys-mjs.patch b/src/browser/themes/BuiltInThemeConfig-sys-mjs.patch index 7323914e..01ba3d2f 100644 --- a/src/browser/themes/BuiltInThemeConfig-sys-mjs.patch +++ b/src/browser/themes/BuiltInThemeConfig-sys-mjs.patch @@ -1,5 +1,5 @@ diff --git a/browser/themes/BuiltInThemeConfig.sys.mjs b/browser/themes/BuiltInThemeConfig.sys.mjs -index 4e5a4f1795c18241d9143d159f7d040142e728d4..f4b0e9a7077076f2fbe8ac17fa6aadf586c6b37c 100644 +index 081187147736f56abfe5866a69e00ac13a8dd940..9a980fe858c1a77af7634037aebc332d237e9c11 100644 --- a/browser/themes/BuiltInThemeConfig.sys.mjs +++ b/browser/themes/BuiltInThemeConfig.sys.mjs @@ -33,13 +33,6 @@ export const BuiltInThemeConfig = new Map([ diff --git a/src/browser/themes/shared/tabbrowser/tabs-css.patch b/src/browser/themes/shared/tabbrowser/tabs-css.patch index a89f5c49..3db54276 100644 --- a/src/browser/themes/shared/tabbrowser/tabs-css.patch +++ b/src/browser/themes/shared/tabbrowser/tabs-css.patch @@ -1,5 +1,5 @@ diff --git a/browser/themes/shared/tabbrowser/tabs.css b/browser/themes/shared/tabbrowser/tabs.css -index f03eb840f363c01a0ab304659795b51f4f61a866..24a0c0cc573e27776843925b83cc919fa546aeb9 100644 +index 6ca85d9d4d593271fe49138ea736bd96651c05f5..192acb662eaeaeb67df890de4c9681952b078526 100644 --- a/browser/themes/shared/tabbrowser/tabs.css +++ b/browser/themes/shared/tabbrowser/tabs.css @@ -32,7 +32,7 @@ diff --git a/src/devtools/startup/DevToolsStartup-sys-mjs.patch b/src/devtools/startup/DevToolsStartup-sys-mjs.patch index e48f57e2..a8703305 100644 --- a/src/devtools/startup/DevToolsStartup-sys-mjs.patch +++ b/src/devtools/startup/DevToolsStartup-sys-mjs.patch @@ -1,8 +1,8 @@ diff --git a/devtools/startup/DevToolsStartup.sys.mjs b/devtools/startup/DevToolsStartup.sys.mjs -index de5cd910c85a195496eddf38d85b78fb97694ef1..d10d6dfeb25bf01e86d84d3843c5a42551cac3bd 100644 +index 91b27e5b5fd938f8c5f141214b934999e0ad871e..d2fdae0b0de64c016abbdd5bf124da278d425b24 100644 --- a/devtools/startup/DevToolsStartup.sys.mjs +++ b/devtools/startup/DevToolsStartup.sys.mjs -@@ -806,6 +806,7 @@ DevToolsStartup.prototype = { +@@ -813,6 +813,7 @@ DevToolsStartup.prototype = { // account (see bug 832984). const mainKeyset = doc.getElementById("mainKeyset"); mainKeyset.parentNode.insertBefore(keyset, mainKeyset); diff --git a/src/dom/base/use_counter_metrics-yaml.patch b/src/dom/base/use_counter_metrics-yaml.patch index 336aa418..8dca6c2b 100644 --- a/src/dom/base/use_counter_metrics-yaml.patch +++ b/src/dom/base/use_counter_metrics-yaml.patch @@ -1,8 +1,8 @@ diff --git a/dom/base/use_counter_metrics.yaml b/dom/base/use_counter_metrics.yaml -index ffdb908e5760eea8643f3c3f85979cb5f7ff36ae..8ab16b5283f8c15f20b0d630a9b5fc82ec803af5 100644 +index 58755773c26952b79df258dd8f55147c77db9c5f..041bd3fe99303621733cd3543e196b6a03950526 100644 --- a/dom/base/use_counter_metrics.yaml +++ b/dom/base/use_counter_metrics.yaml -@@ -21289,6 +21289,22 @@ use.counter.css.page: +@@ -21402,6 +21402,22 @@ use.counter.css.page: send_in_pings: - use-counters @@ -25,7 +25,7 @@ index ffdb908e5760eea8643f3c3f85979cb5f7ff36ae..8ab16b5283f8c15f20b0d630a9b5fc82 css_transform_origin: type: counter description: > -@@ -33259,6 +33275,22 @@ use.counter.css.doc: +@@ -33372,6 +33388,22 @@ use.counter.css.doc: send_in_pings: - use-counters diff --git a/src/dom/script/ScriptLoader-cpp.patch b/src/dom/script/ScriptLoader-cpp.patch index aa276a3b..0749ac24 100644 --- a/src/dom/script/ScriptLoader-cpp.patch +++ b/src/dom/script/ScriptLoader-cpp.patch @@ -1,8 +1,8 @@ diff --git a/dom/script/ScriptLoader.cpp b/dom/script/ScriptLoader.cpp -index 6276dcdb031a0325c481a1ea058d513f5c153944..4aee4acd681d3337cce7799d90db0fa0d777762d 100644 +index b3bec3821582d48c79cd88a4efe5c7bae1fd42e6..0bb81a8b0fa9478c894f80cfa81fd04c67fdd79f 100644 --- a/dom/script/ScriptLoader.cpp +++ b/dom/script/ScriptLoader.cpp -@@ -2626,6 +2626,36 @@ void ScriptLoader::CalculateBytecodeCacheFlag(ScriptLoadRequest* aRequest) { +@@ -2670,6 +2670,36 @@ void ScriptLoader::CalculateBytecodeCacheFlag(ScriptLoadRequest* aRequest) { hasFetchCountMin = false; break; } diff --git a/src/layout/generic/nsIFrame-cpp.patch b/src/layout/generic/nsIFrame-cpp.patch index 6de352f7..2cdfeb03 100644 --- a/src/layout/generic/nsIFrame-cpp.patch +++ b/src/layout/generic/nsIFrame-cpp.patch @@ -1,8 +1,8 @@ diff --git a/layout/generic/nsIFrame.cpp b/layout/generic/nsIFrame.cpp -index 01f724b0c42999107c4622323f849ddd2a6fe5c9..9dafa755c711c43c11835dfe9f7ba1b70b52b9a3 100644 +index 0fff882bd3b643e3ab59cfaada984bef0ae7fee4..71e981251fa9395cbb14927d9bd3473c1e18a2cb 100644 --- a/layout/generic/nsIFrame.cpp +++ b/layout/generic/nsIFrame.cpp -@@ -11694,6 +11694,11 @@ gfx::Matrix nsIFrame::ComputeWidgetTransform() const { +@@ -11721,6 +11721,11 @@ gfx::Matrix nsIFrame::ComputeWidgetTransform() const { gfx::Matrix4x4 matrix = nsStyleTransformMatrix::ReadTransforms( uiReset->mMozWindowTransform, refBox, float(appUnitsPerDevPixel)); diff --git a/src/layout/style/nsStyleStruct-h.patch b/src/layout/style/nsStyleStruct-h.patch index 1d16a458..fe63fcaf 100644 --- a/src/layout/style/nsStyleStruct-h.patch +++ b/src/layout/style/nsStyleStruct-h.patch @@ -1,8 +1,8 @@ diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h -index 97eed3431394e21eb7b8890fd87aea8240e23f2b..898d5876c03f822e9e0f2ec892ee86e0d17daf73 100644 +index 472c15a359ecd7ad0834d479f1acc53b4527f5ac..9f8377ab507b5883b92621160987a97e0be80014 100644 --- a/layout/style/nsStyleStruct.h +++ b/layout/style/nsStyleStruct.h -@@ -1875,6 +1875,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleUIReset { +@@ -1876,6 +1876,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleUIReset { // The margin of the window region that should be transparent to events. mozilla::StyleLength mMozWindowInputRegionMargin; mozilla::StyleTransform mMozWindowTransform; diff --git a/src/modules/libpref/init/StaticPrefList-yaml.patch b/src/modules/libpref/init/StaticPrefList-yaml.patch index 4beadaee..f2a4521c 100644 --- a/src/modules/libpref/init/StaticPrefList-yaml.patch +++ b/src/modules/libpref/init/StaticPrefList-yaml.patch @@ -1,8 +1,8 @@ diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml -index 2f0bb8a6e21bec5c89a4a25413bf8d1308210f52..450d8265c128861f3ad5973ec0417b9463ebffd0 100644 +index a8ba391326f811ae80510585a3c6ab8d7579f739..5e4569032d4c62e59065262f7069663f9acadad1 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml -@@ -18598,6 +18598,7 @@ +@@ -18804,6 +18804,7 @@ mirror: always #endif diff --git a/src/netwerk/protocol/http/moz-build.patch b/src/netwerk/protocol/http/moz-build.patch index 933d7ca6..94e828ee 100644 --- a/src/netwerk/protocol/http/moz-build.patch +++ b/src/netwerk/protocol/http/moz-build.patch @@ -1,8 +1,8 @@ diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build -index 9a737b89b791866a522100eac99d981a06524b82..2933072d0e8390ca584d0654920b749a180f41ef 100644 +index a83080d963322d7baa581f1ca61f93d42bb5a938..0741be2ffc5449be829af7f6067d1abcdc86d155 100644 --- a/netwerk/protocol/http/moz.build +++ b/netwerk/protocol/http/moz.build -@@ -218,7 +218,7 @@ LOCAL_INCLUDES += [ +@@ -223,7 +223,7 @@ LOCAL_INCLUDES += [ "/netwerk/url-classifier", ] diff --git a/src/servo/components/style/gecko/media_features-rs.patch b/src/servo/components/style/gecko/media_features-rs.patch index 94ba5a6f..f9383e76 100644 --- a/src/servo/components/style/gecko/media_features-rs.patch +++ b/src/servo/components/style/gecko/media_features-rs.patch @@ -1,5 +1,5 @@ diff --git a/servo/components/style/gecko/media_features.rs b/servo/components/style/gecko/media_features.rs -index 2baf0df323c83107a9a38e76bda3a273892b121e..8d03eeb78638c7c1bfc2cfff59571c76af11a607 100644 +index cc24406e22f536733b07a9398580a8719b61e134..214f238b38377a8480711ea2d0ec30e99800bb5c 100644 --- a/servo/components/style/gecko/media_features.rs +++ b/servo/components/style/gecko/media_features.rs @@ -13,6 +13,9 @@ use crate::values::computed::{CSSPixelLength, Context, Ratio, Resolution}; @@ -12,7 +12,7 @@ index 2baf0df323c83107a9a38e76bda3a273892b121e..8d03eeb78638c7c1bfc2cfff59571c76 fn device_size(device: &Device) -> Size2D { let mut width = 0; -@@ -615,6 +618,13 @@ fn eval_moz_overlay_scrollbars(context: &Context) -> bool { +@@ -606,6 +609,13 @@ fn eval_moz_overlay_scrollbars(context: &Context) -> bool { unsafe { bindings::Gecko_MediaFeatures_UseOverlayScrollbars(context.device().document()) } } @@ -26,7 +26,7 @@ index 2baf0df323c83107a9a38e76bda3a273892b121e..8d03eeb78638c7c1bfc2cfff59571c76 fn get_lnf_int(int_id: i32) -> i32 { unsafe { bindings::Gecko_GetLookAndFeelInt(int_id) } } -@@ -662,7 +672,7 @@ macro_rules! lnf_int_feature { +@@ -653,7 +663,7 @@ macro_rules! lnf_int_feature { /// to support new types in these entries and (2) ensuring that either /// nsPresContext::MediaFeatureValuesChanged is called when the value that /// would be returned by the evaluator function could change. @@ -35,7 +35,7 @@ index 2baf0df323c83107a9a38e76bda3a273892b121e..8d03eeb78638c7c1bfc2cfff59571c76 feature!( atom!("width"), AllowsRanges::Yes, -@@ -927,6 +937,12 @@ pub static MEDIA_FEATURES: [QueryFeatureDescription; 61] = [ +@@ -918,6 +928,12 @@ pub static MEDIA_FEATURES: [QueryFeatureDescription; 61] = [ Evaluator::BoolInteger(eval_moz_overlay_scrollbars), FeatureFlags::CHROME_AND_UA_ONLY, ), diff --git a/src/toolkit/components/aboutprocesses/content/aboutProcesses-html.patch b/src/toolkit/components/aboutprocesses/content/aboutProcesses-html.patch index 9e3e5641..4e5e7c77 100644 --- a/src/toolkit/components/aboutprocesses/content/aboutProcesses-html.patch +++ b/src/toolkit/components/aboutprocesses/content/aboutProcesses-html.patch @@ -1,5 +1,5 @@ diff --git a/toolkit/components/aboutprocesses/content/aboutProcesses.html b/toolkit/components/aboutprocesses/content/aboutProcesses.html -index 3d7085f487eb8eb3fb94dcc89e390dee525d8375..94298c2cb237edce7bb344797c054ba61b9f4d24 100644 +index 1d936bcca6a606f062b9438d78a1165445468471..cbefb51920e7b2ad11621ab2b36c69fa63967dfe 100644 --- a/toolkit/components/aboutprocesses/content/aboutProcesses.html +++ b/toolkit/components/aboutprocesses/content/aboutProcesses.html @@ -20,6 +20,7 @@ diff --git a/src/toolkit/components/pictureinpicture/PictureInPicture-sys-mjs.patch b/src/toolkit/components/pictureinpicture/PictureInPicture-sys-mjs.patch index 1e91f01f..0d047638 100644 --- a/src/toolkit/components/pictureinpicture/PictureInPicture-sys-mjs.patch +++ b/src/toolkit/components/pictureinpicture/PictureInPicture-sys-mjs.patch @@ -1,8 +1,8 @@ diff --git a/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs b/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs -index 5da0404b2672ba8cce7bcf808bf2373474776654..6a22fce1212bd6ac6bdd4962b8247c3db956f0eb 100644 +index 5644bad94bd4741c4c807eaf5633ee18aacd633f..f89a3e24e850df04aebceb1ff70c0bed5a9db7e5 100644 --- a/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs +++ b/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs -@@ -126,6 +126,9 @@ export class PictureInPictureToggleParent extends JSWindowActorParent { +@@ -122,6 +122,9 @@ export class PictureInPictureToggleParent extends JSWindowActorParent { if (browser.ownerGlobal.gBrowser.selectedBrowser == browser) { break; } @@ -12,7 +12,7 @@ index 5da0404b2672ba8cce7bcf808bf2373474776654..6a22fce1212bd6ac6bdd4962b8247c3d let actor = browsingContext.currentWindowGlobal.getActor( "PictureInPictureLauncher" ); -@@ -494,7 +497,7 @@ export var PictureInPicture = { +@@ -490,7 +493,7 @@ export var PictureInPicture = { // focus the tab's window tab.ownerGlobal.focus(); diff --git a/src/toolkit/content/widgets/arrowscrollbox-js.patch b/src/toolkit/content/widgets/arrowscrollbox-js.patch index ebfbd2de..2094f349 100644 --- a/src/toolkit/content/widgets/arrowscrollbox-js.patch +++ b/src/toolkit/content/widgets/arrowscrollbox-js.patch @@ -1,5 +1,5 @@ diff --git a/toolkit/content/widgets/arrowscrollbox.js b/toolkit/content/widgets/arrowscrollbox.js -index 328c770d275ebbaada8a44438eaf738b1a62d985..95460108c6356408170b8a4a40d55a8f0621756b 100644 +index f9191af09f1b7a1654aff62807e7dad573afc172..f94a8b3dc5871fba5d0dbed5d487d6e32a1ff29a 100644 --- a/toolkit/content/widgets/arrowscrollbox.js +++ b/toolkit/content/widgets/arrowscrollbox.js @@ -98,6 +98,7 @@ diff --git a/src/toolkit/content/widgets/tabbox-js.patch b/src/toolkit/content/widgets/tabbox-js.patch index 5b689ab4..63e9990a 100644 --- a/src/toolkit/content/widgets/tabbox-js.patch +++ b/src/toolkit/content/widgets/tabbox-js.patch @@ -1,5 +1,5 @@ diff --git a/toolkit/content/widgets/tabbox.js b/toolkit/content/widgets/tabbox.js -index 717f0583f224be2d09a7966ee5627ebab83cc07f..ec251b99562f2a9b6dcfecc4588e44bbff315612 100644 +index 6775a7635c6cdbb276b3a912d0bba07840acb28f..fc5d3b1fab286c657c27b98d56bb616dfab3caef 100644 --- a/toolkit/content/widgets/tabbox.js +++ b/toolkit/content/widgets/tabbox.js @@ -213,7 +213,7 @@ @@ -11,7 +11,7 @@ index 717f0583f224be2d09a7966ee5627ebab83cc07f..ec251b99562f2a9b6dcfecc4588e44bb this._selectedPanel?.classList.add("deck-selected"); } this.setAttribute("selectedIndex", val); -@@ -609,7 +609,7 @@ +@@ -610,7 +610,7 @@ if (!tab) { return; } @@ -20,7 +20,7 @@ index 717f0583f224be2d09a7966ee5627ebab83cc07f..ec251b99562f2a9b6dcfecc4588e44bb if (otherTab != tab && otherTab.selected) { otherTab._selected = false; } -@@ -822,7 +822,7 @@ +@@ -823,7 +823,7 @@ if (tab == startTab) { return null; } @@ -29,7 +29,7 @@ index 717f0583f224be2d09a7966ee5627ebab83cc07f..ec251b99562f2a9b6dcfecc4588e44bb return tab; } } -@@ -887,7 +887,7 @@ +@@ -888,7 +888,7 @@ let { ariaFocusedItem } = this; let startTab = ariaFocusedItem; if (!ariaFocusedItem || !this.allTabs.includes(ariaFocusedItem)) { diff --git a/src/toolkit/modules/moz-build.patch b/src/toolkit/modules/moz-build.patch index 3daf800f..7f2898cb 100644 --- a/src/toolkit/modules/moz-build.patch +++ b/src/toolkit/modules/moz-build.patch @@ -1,8 +1,8 @@ diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build -index dd8d6498f5b7244726274c0588dae68f8261cbc0..ac1e25707a1d2ebf191f04f9e38e092cb3f4aa27 100644 +index b7dd298c4ffa1b95531e3646d57a52e524fcf801..da23bcd2a8b4b49ce07f4602f5e624bf4bfbfc8d 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build -@@ -286,6 +286,7 @@ for var in ( +@@ -282,6 +282,7 @@ for var in ( "DLL_SUFFIX", "DEBUG_JS_MODULES", "OMNIJAR_NAME", diff --git a/src/toolkit/moz-configure.patch b/src/toolkit/moz-configure.patch index ffc5d8d4..ece47403 100644 --- a/src/toolkit/moz-configure.patch +++ b/src/toolkit/moz-configure.patch @@ -1,5 +1,5 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure -index e5e517635d639f43de064fdc81a33090c28ca786..67ce7a27d93c3c6f9c8045c2d5796b85bf059113 100644 +index 09b3065c214ecceacb6f264cdacbb777252f33ea..97ee12093d6330ae9da4aa1bea2ecd5b76843110 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -22,6 +22,7 @@ def check_moz_app_id(moz_app_id, build_project): diff --git a/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch b/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch index 6884109a..246cf44d 100644 --- a/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch +++ b/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch @@ -1,5 +1,5 @@ diff --git a/toolkit/mozapps/extensions/AddonManager.sys.mjs b/toolkit/mozapps/extensions/AddonManager.sys.mjs -index 044e2960be887b9272509ceff2fc1a2952fd997c..326ddbc0f10fb4134f8b6116c788bef24bb2d3e8 100644 +index 883e8389eec97815adfdb8c62fc15482f6d7f0e7..234c956ba799666a3cba6fd6dcdad774ffc6b79e 100644 --- a/toolkit/mozapps/extensions/AddonManager.sys.mjs +++ b/toolkit/mozapps/extensions/AddonManager.sys.mjs @@ -1221,12 +1221,12 @@ var AddonManagerInternal = { diff --git a/src/toolkit/mozapps/extensions/content/aboutaddons-html.patch b/src/toolkit/mozapps/extensions/content/aboutaddons-html.patch index 26673d0f..6dbf2cc0 100644 --- a/src/toolkit/mozapps/extensions/content/aboutaddons-html.patch +++ b/src/toolkit/mozapps/extensions/content/aboutaddons-html.patch @@ -1,8 +1,8 @@ diff --git a/toolkit/mozapps/extensions/content/aboutaddons.html b/toolkit/mozapps/extensions/content/aboutaddons.html -index a075350abd62ffa34874dbd8d5a9a3f9aec3560d..5cad47c50518eeb41b4d9657fa805d8fa1dba470 100644 +index 67808c799aca92a0c71731ab0c345bb478522368..5ddcbcecd43b2b04eb4c0e5b86eebd69b142a5a3 100644 --- a/toolkit/mozapps/extensions/content/aboutaddons.html +++ b/toolkit/mozapps/extensions/content/aboutaddons.html -@@ -73,6 +73,7 @@ +@@ -82,6 +82,7 @@ type="module" src="chrome://global/content/elements/moz-five-star.mjs" > diff --git a/src/toolkit/mozapps/extensions/internal/XPIDatabase-sys-mjs.patch b/src/toolkit/mozapps/extensions/internal/XPIDatabase-sys-mjs.patch index 0739270f..b05d7ebb 100644 --- a/src/toolkit/mozapps/extensions/internal/XPIDatabase-sys-mjs.patch +++ b/src/toolkit/mozapps/extensions/internal/XPIDatabase-sys-mjs.patch @@ -1,8 +1,8 @@ diff --git a/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs b/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs -index f6333f54da4cd0e81ef0cdf5720d54480a9c865e..2d098b0675e3efdfd6fa1ac0fed0e293b5367b1e 100644 +index 1b01851e2fff6d07a4be8e282bd4b85e934a7978..1354405f0b2938d2f22a3dea000405babdafd665 100644 --- a/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs +++ b/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs -@@ -138,7 +138,7 @@ const KEY_APP_GLOBAL = "app-global"; +@@ -139,7 +139,7 @@ const KEY_APP_GLOBAL = "app-global"; const KEY_APP_PROFILE = "app-profile"; const KEY_APP_TEMPORARY = "app-temporary"; @@ -11,7 +11,7 @@ index f6333f54da4cd0e81ef0cdf5720d54480a9c865e..2d098b0675e3efdfd6fa1ac0fed0e293 // Properties to cache and reload when an addon installation is pending const PENDING_INSTALL_METADATA = [ -@@ -1771,8 +1771,11 @@ const updatedAddonFluentIds = new Map([ +@@ -1778,8 +1778,11 @@ const updatedAddonFluentIds = new Map([ updatedAddonFluentIds.get(defaultFluentId) || defaultFluentId; [formattedMessage] = l10n.formatMessagesSync([{ id: fluentId }]); } diff --git a/src/toolkit/profile/nsToolkitProfileService-cpp.patch b/src/toolkit/profile/nsToolkitProfileService-cpp.patch index cb275eb4..7535d4ee 100644 --- a/src/toolkit/profile/nsToolkitProfileService-cpp.patch +++ b/src/toolkit/profile/nsToolkitProfileService-cpp.patch @@ -1,5 +1,5 @@ diff --git a/toolkit/profile/nsToolkitProfileService.cpp b/toolkit/profile/nsToolkitProfileService.cpp -index c1b7a4a3c9d01e660ec85cf114a6b1513d8fb7ce..df199875663b2b7aba6a5da33987b759e4e0d41b 100644 +index e6722fb8f379c3032301fc3c1c49d894a566c28a..f6c560bb3f2ffdba4eaed876f7679245235fde8c 100644 --- a/toolkit/profile/nsToolkitProfileService.cpp +++ b/toolkit/profile/nsToolkitProfileService.cpp @@ -82,6 +82,8 @@ using namespace mozilla; @@ -11,7 +11,7 @@ index c1b7a4a3c9d01e660ec85cf114a6b1513d8fb7ce..df199875663b2b7aba6a5da33987b759 struct KeyValue { KeyValue(const char* aKey, const char* aValue) : key(aKey), value(aValue) {} -@@ -1409,7 +1411,7 @@ nsresult nsToolkitProfileService::CreateDefaultProfile( +@@ -1404,7 +1406,7 @@ nsresult nsToolkitProfileService::CreateDefaultProfile( if (mUseDevEditionProfile) { name.AssignLiteral(DEV_EDITION_NAME); } else if (mUseDedicatedProfile) { diff --git a/src/toolkit/themes/shared/aboutReader-css.patch b/src/toolkit/themes/shared/aboutReader-css.patch index 9813bea1..0a914748 100644 --- a/src/toolkit/themes/shared/aboutReader-css.patch +++ b/src/toolkit/themes/shared/aboutReader-css.patch @@ -1,8 +1,8 @@ diff --git a/toolkit/themes/shared/aboutReader.css b/toolkit/themes/shared/aboutReader.css -index e91ae235726ec4edfbbdfebca159622a757640e9..21f761c5706c4747f5a990fc61b5f95e2eb63b5d 100644 +index 2b06ac3bdb2e122f4553d7e11e1c9462ee45b487..9a78e79523a59448f0425609c311f81c14d4525b 100644 --- a/toolkit/themes/shared/aboutReader.css +++ b/toolkit/themes/shared/aboutReader.css -@@ -1190,3 +1190,43 @@ pre code { +@@ -1191,3 +1191,43 @@ pre code { display: block; overflow: auto; } diff --git a/src/widget/gtk/nsAppShell-cpp.patch b/src/widget/gtk/nsAppShell-cpp.patch index 5e170a9d..c1ecd0b8 100644 --- a/src/widget/gtk/nsAppShell-cpp.patch +++ b/src/widget/gtk/nsAppShell-cpp.patch @@ -1,8 +1,8 @@ diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp -index eef6e76a26341d30748c6c4f054092ba0bfdd865..65b6e2583e6e6891dcbf9faeeefed21cc2d40d15 100644 +index 117c1d6ae07c9b2539005dd05edf2c622985ac2f..126748a8fa13f3f9c163aca06a1d65f972b91f8f 100644 --- a/widget/gtk/nsAppShell.cpp +++ b/widget/gtk/nsAppShell.cpp -@@ -419,7 +419,8 @@ nsresult nsAppShell::Init() { +@@ -488,7 +488,8 @@ nsresult nsAppShell::Init() { gchar* name = gdk_pixbuf_format_get_name(format); if (strcmp(name, "jpeg") && strcmp(name, "png") && strcmp(name, "gif") && strcmp(name, "bmp") && strcmp(name, "ico") && strcmp(name, "xpm") &&