From 90a6ebe94819ad1ad5b611ec8f628be372949a8a Mon Sep 17 00:00:00 2001 From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com> Date: Sat, 16 May 2026 00:29:01 +0200 Subject: [PATCH] no-bug: Sync upstream Firefox to version `151.0` (gh-13706) --- README.md | 2 +- build/firefox-cache/l10n-last-commit-hash | 2 +- src/-prettierignore.patch | 4 +- .../actors/EncryptedMediaParent-sys-mjs.patch | 4 +- src/browser/actors/WebRTCParent-sys-mjs.patch | 2 +- src/browser/app/splash-rc.patch | 4 +- .../base/content/browser-addons-js.patch | 22 +- .../base/content/browser-commands-js.patch | 10 +- .../browser-fullScreenAndPointerLock-js.patch | 4 +- .../base/content/browser-init-js.patch | 6 +- src/browser/base/content/browser-js.patch | 12 +- .../base/content/browser-places-js.patch | 4 +- .../base/content/browser-sets-inc-xhtml.patch | 9 + .../base/content/browser-sets-inc.patch | 9 - .../base/content/browser-sets-js.patch | 6 +- src/browser/base/content/browser-xhtml.patch | 8 +- .../content/navigator-toolbox-inc-xhtml.patch | 6 +- .../base/content/navigator-toolbox-js.patch | 12 +- .../base/content/nsContextMenu-sys-mjs.patch | 4 +- src/browser/base/moz-build.patch | 4 +- .../BrowserContentHandler-sys-mjs.patch | 2 +- .../components/BrowserGlue-sys-mjs.patch | 6 +- .../content/aboutwelcome-css.patch | 8 +- .../ui/modules/AIWindow-sys-mjs.patch | 4 +- .../CustomizableUI-sys-mjs.patch | 48 ++-- .../customizableui/content/panelUI-js.patch | 6 +- .../extensions/parent/ext-browser-js.patch | 8 +- .../extensions/parent/ext-tabs-js.patch | 6 +- .../places/PlacesUIUtils-sys-mjs.patch | 2 +- .../content/browserPlacesViews-js.patch | 12 +- .../dialogs/syncChooseWhatToSync-xhtml.patch | 6 +- .../components/preferences/jar-mn.patch | 4 +- .../preferences/main-inc-xhtml.patch | 2 +- .../components/preferences/main-js.patch | 14 +- .../preferences/preferences-js.patch | 8 +- .../preferences/preferences-xhtml.patch | 82 ++---- .../preferences/sync-inc-xhtml.patch | 4 +- .../sessionstore/SessionStore-sys-mjs.patch | 4 +- .../sidebar/browser-sidebar-js.patch | 4 +- .../tabbrowser/AsyncTabSwitcher-sys-mjs.patch | 4 +- .../tabbrowser/TabUnloader-sys-mjs.patch | 6 +- .../content/browser-ctrlTab-js.patch | 4 +- .../tabbrowser/content/drag-and-drop-js.patch | 42 +-- .../tabbrowser/content/tab-js.patch | 23 +- .../tabbrowser/content/tabbrowser-js.patch | 190 ++++++------- .../tabbrowser/content/tabgroup-js.patch | 2 +- .../urlbar/UrlbarController-sys-mjs.patch | 6 +- .../urlbar/UrlbarMuxerStandard-sys-mjs.patch | 4 +- .../UrlbarProvidersManager-sys-mjs.patch | 2 +- .../urlbar/UrlbarResult-sys-mjs.patch | 2 +- .../urlbar/UrlbarUtils-sys-mjs.patch | 12 +- .../urlbar/UrlbarValueFormatter-sys-mjs.patch | 2 +- .../urlbar/content/UrlbarInput-mjs.patch | 62 ++--- .../content/enUS-searchFeatures-ftl.patch | 2 +- .../newtab/lib/ActivityStream-sys-mjs.patch | 4 +- .../windows/nsis/defines-nsi-in.patch | 13 +- .../windows/nsis/installer-nsi.patch | 14 +- .../windows/nsis/uninstaller-nsi.patch | 4 +- .../modules/BrowserDOMWindow-sys-mjs.patch | 6 +- .../modules/URILoadingHelper-sys-mjs.patch | 6 +- src/browser/themes/linux/browser-css.patch | 4 +- src/browser/themes/osx/browser-css.patch | 2 +- .../themes/shared/browser-shared-css.patch | 4 +- .../identity-block/identity-block-css.patch | 4 +- src/browser/themes/shared/jar-inc-mn.patch | 4 +- .../shared/preferences/zen-preferences.css | 8 - .../shared/tabbrowser/content-area-css.patch | 8 +- .../themes/shared/tabbrowser/tabs-css.patch | 70 ++--- .../themes/shared/toolbarbuttons-css.patch | 12 +- .../themes/shared/urlbar-searchbar-css.patch | 26 +- .../variables-css.patch} | 8 +- .../shared/urlbar/view-proton-css.patch | 21 ++ .../themes/shared/urlbarView-css.patch | 21 -- src/browser/themes/windows/browser-css.patch | 2 +- src/build/moz-build.patch | 4 +- .../startup/DevToolsStartup-sys-mjs.patch | 2 +- src/docshell/base/BrowsingContext-h.patch | 8 +- src/docshell/base/nsAboutRedirector-cpp.patch | 2 +- src/dom/base/Document-cpp.patch | 6 +- .../BrowsingContext-webidl.patch | 4 +- .../mediaelement/HTMLMediaElement-cpp.patch | 6 +- src/eslint-ignores-config-mjs.patch | 4 +- ...low_backdrop_to_work_on_transparency.patch | 8 +- .../native_macos_popovers/D284084.patch | 6 +- .../session_store_use_size_hint/D247145.patch | 61 ----- .../session_store_use_size_hint/D247215.patch | 251 ++++++++++++++++++ .../session_store_use_size_hint/D298708.patch | 44 +-- src/external-patches/manifest.json | 2 +- src/gfx/layers/AnimationInfo-cpp.patch | 6 +- src/layout/base/PresShell-cpp.patch | 6 +- src/layout/generic/ViewportFrame-cpp.patch | 6 +- src/layout/painting/nsDisplayList-cpp.patch | 2 +- src/python/mozlint/mozlint/roller-py.patch | 4 +- .../production/firefox-browser-xml.patch | 4 +- .../style/queries/feature_expression-rs.patch | 12 +- src/testing/mochitest/browser-test-js.patch | 4 +- .../PictureInPictureChild-sys-mjs.patch | 4 +- .../extensions/parent/ext-tabs-base-js.patch | 14 +- src/toolkit/content/widgets/infobar-css.patch | 2 +- .../widgets/moz-toggle/moz-toggle-css.patch | 15 -- .../moz-toggle/moz-toggle-tokens-css.patch | 15 ++ src/toolkit/content/widgets/tabbox-js.patch | 14 +- .../LightweightThemeConsumer-sys-mjs.patch | 4 +- .../modules/PopupNotifications-sys-mjs.patch | 4 +- src/toolkit/modules/moz-build.patch | 4 +- .../installer/windows/nsis/makensis-mk.patch | 2 +- .../update/updater/updater-common-build.patch | 4 +- .../profile/nsToolkitProfileService-cpp.patch | 6 +- .../dist/tokens-shared-css.patch | 2 +- .../shared/design-system/src/panel-css.patch | 15 ++ .../shared/in-content/common-shared-css.patch | 10 +- src/toolkit/themes/shared/menulist-css.patch | 4 +- src/toolkit/themes/shared/popup-css.patch | 15 -- src/toolkit/xre/nsXREDirProvider-cpp.patch | 8 +- src/tools/lint/eslint/__init__-py.patch | 4 +- src/tools/lint/rejected-words-yml.patch | 2 +- .../signing/macos/mach_commands-py.patch | 4 +- src/widget/cocoa/VibrancyManager-mm.patch | 2 +- src/widget/cocoa/nsCocoaUtils-mm.patch | 4 +- src/zen/common/styles/zen-omnibox.css | 2 +- .../tests/mochitests/readermode/browser.toml | 2 + .../readermode/browser_drag_url_readerMode.js | 2 +- .../browser_readerMode_readingTime.js | 79 +++++- .../readermode/readerModeArticleLong.html | 156 +++++++++++ .../readermode/readerModeArticleVeryLong.html | 249 +++++++++++++++++ src/zen/tests/mochitests/sandbox/browser.toml | 9 +- .../shell/gtest/LimitedAccessFeatureTests.cpp | 1 - .../gtest/SetDefaultBrowserButtonTests.cpp | 238 +++++++++++++++++ .../mochitests/shell/gtest/ShellLinkTests.cpp | 1 - .../tests/mochitests/shell/gtest/moz.build | 3 +- .../shell/unit/test_linuxDesktopEntry.js | 234 +++++++++++++++- src/zen/welcome/ZenWelcome.mjs | 2 +- surfer.json | 4 +- 133 files changed, 1802 insertions(+), 758 deletions(-) create mode 100644 src/browser/base/content/browser-sets-inc-xhtml.patch delete mode 100644 src/browser/base/content/browser-sets-inc.patch rename src/browser/themes/shared/{urlbar-variables-css.patch => urlbar/variables-css.patch} (62%) create mode 100644 src/browser/themes/shared/urlbar/view-proton-css.patch delete mode 100644 src/browser/themes/shared/urlbarView-css.patch delete mode 100644 src/external-patches/firefox/session_store_use_size_hint/D247145.patch create mode 100644 src/external-patches/firefox/session_store_use_size_hint/D247215.patch delete mode 100644 src/toolkit/content/widgets/moz-toggle/moz-toggle-css.patch create mode 100644 src/toolkit/content/widgets/moz-toggle/moz-toggle-tokens-css.patch create mode 100644 src/toolkit/themes/shared/design-system/src/panel-css.patch delete mode 100644 src/toolkit/themes/shared/popup-css.patch create mode 100644 src/zen/tests/mochitests/readermode/readerModeArticleLong.html create mode 100644 src/zen/tests/mochitests/readermode/readerModeArticleVeryLong.html create mode 100644 src/zen/tests/mochitests/shell/gtest/SetDefaultBrowserButtonTests.cpp diff --git a/README.md b/README.md index f7b1a498c..b79094c20 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne ### Firefox Versions - [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `150.0.3`! 🚀 -- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 150.0.3`! +- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 151.0`! ### Contributing diff --git a/build/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash index d647e7537..0439d0657 100644 --- a/build/firefox-cache/l10n-last-commit-hash +++ b/build/firefox-cache/l10n-last-commit-hash @@ -1 +1 @@ -69c3d9ff05fd352d761a41ec35f59b06e166e3bc \ No newline at end of file +0c5fe3a13813ee9cee3324047c8f0294bb8f2aff \ No newline at end of file diff --git a/src/-prettierignore.patch b/src/-prettierignore.patch index 5f64ab634..d844969ee 100644 --- a/src/-prettierignore.patch +++ b/src/-prettierignore.patch @@ -1,8 +1,8 @@ diff --git a/.prettierignore b/.prettierignore -index 4c6d186c501f7e1b029db186d387f73d97dfed1e..81d0f7dc7f412151256c13ed93bd34d7bd872681 100644 +index de2efe413e5696a3b8d0467a3a9e668dfadd8a1a..01c76d8e639d5630fca9cccb55d415fc4e903e91 100644 --- a/.prettierignore +++ b/.prettierignore -@@ -1806,3 +1806,12 @@ tools/ts/test/baselines/ +@@ -1805,3 +1805,12 @@ tools/ts/test/baselines/ try_task_config.json xpcom/idl-parser/xpidl/fixtures/xpctest.d.json **/package-lock.json diff --git a/src/browser/actors/EncryptedMediaParent-sys-mjs.patch b/src/browser/actors/EncryptedMediaParent-sys-mjs.patch index a68cec8a1..74f9f5d19 100644 --- a/src/browser/actors/EncryptedMediaParent-sys-mjs.patch +++ b/src/browser/actors/EncryptedMediaParent-sys-mjs.patch @@ -1,8 +1,8 @@ diff --git a/browser/actors/EncryptedMediaParent.sys.mjs b/browser/actors/EncryptedMediaParent.sys.mjs -index 9d3d3db9761cf5b2fde1f70992e82b1733241863..3dc64dc395d5237bf2c290cb8588cf467fb8729a 100644 +index 492dce93d3cc7c6ec16db047c9e47b175ef3a0fe..757e5543e0e6900c414db6d7a96d511608c1e50a 100644 --- a/browser/actors/EncryptedMediaParent.sys.mjs +++ b/browser/actors/EncryptedMediaParent.sys.mjs -@@ -200,6 +200,7 @@ export class EncryptedMediaParent extends JSWindowActorParent { +@@ -199,6 +199,7 @@ export class EncryptedMediaParent extends JSWindowActorParent { "drmContentPlaying", aBrowser ) diff --git a/src/browser/actors/WebRTCParent-sys-mjs.patch b/src/browser/actors/WebRTCParent-sys-mjs.patch index 736cb9905..46e7f96b7 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 e8b762b4c8f71ddafc090415abfe97674401dbc2..5dda5fe9c9bc02ebe7713f7bd21315fe4ba8b8cd 100644 +index b743bd83529c4cd01a6bc820967186dbe41b6144..e24c48bac0f4ae3d4b26087b7e0cac7910019d0e 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/splash-rc.patch b/src/browser/app/splash-rc.patch index 35d9a1f98..d9b7177a6 100644 --- a/src/browser/app/splash-rc.patch +++ b/src/browser/app/splash-rc.patch @@ -1,8 +1,8 @@ diff --git a/browser/app/splash.rc b/browser/app/splash.rc -index 259a8068c3aa256b8c50487a04f1844292b90b2e..8b9c792e1484bb801246b06b6ce43fb6d6271ee8 100644 +index 04c1d3e1db7d067d579512999a08de85a0aa212c..4e04eb5008ca1701c731c3109ba184ccf465b51b 100644 --- a/browser/app/splash.rc +++ b/browser/app/splash.rc -@@ -6,6 +6,9 @@ +@@ -5,6 +5,9 @@ #include #include "nsNativeAppSupportWin.h" diff --git a/src/browser/base/content/browser-addons-js.patch b/src/browser/base/content/browser-addons-js.patch index eb78c7461..8ab878b64 100644 --- a/src/browser/base/content/browser-addons-js.patch +++ b/src/browser/base/content/browser-addons-js.patch @@ -1,8 +1,8 @@ diff --git a/browser/base/content/browser-addons.js b/browser/base/content/browser-addons.js -index 098cf2408bc462f61fb547716754a3af832ffa1e..d062d03f7d258b66740d785cc30abe7932eaea41 100644 +index 853d3c9dd9dd806d49a3c5a44304dd7370f0c90e..ea927b05213981fbfa5494d8d22bce05f45bce08 100644 --- a/browser/base/content/browser-addons.js +++ b/browser/base/content/browser-addons.js -@@ -1061,7 +1061,7 @@ var gXPInstallObserver = { +@@ -1060,7 +1060,7 @@ var gXPInstallObserver = { persistent: true, hideClose: true, popupOptions: { @@ -11,7 +11,7 @@ index 098cf2408bc462f61fb547716754a3af832ffa1e..d062d03f7d258b66740d785cc30abe79 }, }; -@@ -1283,7 +1283,7 @@ var gXPInstallObserver = { +@@ -1282,7 +1282,7 @@ var gXPInstallObserver = { hideClose: true, timeout: Date.now() + 30000, popupOptions: { @@ -20,7 +20,7 @@ index 098cf2408bc462f61fb547716754a3af832ffa1e..d062d03f7d258b66740d785cc30abe79 }, }; -@@ -2210,7 +2210,7 @@ var gUnifiedExtensions = { +@@ -2209,7 +2209,7 @@ var gUnifiedExtensions = { // If the new ID is not added in NOTIFICATION_IDS, consider handling the case // in the "PopupNotificationsBeforeAnchor" handler elsewhere in this file. getPopupAnchorID(aBrowser, aWindow) { @@ -29,7 +29,7 @@ index 098cf2408bc462f61fb547716754a3af832ffa1e..d062d03f7d258b66740d785cc30abe79 const attr = anchorID + "popupnotificationanchor"; if (!aBrowser[attr]) { -@@ -2221,7 +2221,7 @@ var gUnifiedExtensions = { +@@ -2220,7 +2220,7 @@ var gUnifiedExtensions = { anchorID // Anchor on the toolbar icon to position the popup right below the // button. @@ -38,7 +38,7 @@ index 098cf2408bc462f61fb547716754a3af832ffa1e..d062d03f7d258b66740d785cc30abe79 } return anchorID; -@@ -2546,7 +2546,7 @@ var gUnifiedExtensions = { +@@ -2545,7 +2545,7 @@ var gUnifiedExtensions = { requestAnimationFrame(() => this.updateAttention()); }, @@ -47,7 +47,7 @@ index 098cf2408bc462f61fb547716754a3af832ffa1e..d062d03f7d258b66740d785cc30abe79 // A list of extension widget IDs (possibly empty). let widgetIDs; -@@ -2560,7 +2560,7 @@ var gUnifiedExtensions = { +@@ -2559,7 +2559,7 @@ var gUnifiedExtensions = { } // The list of overflowed extensions in the extensions panel. @@ -56,7 +56,7 @@ index 098cf2408bc462f61fb547716754a3af832ffa1e..d062d03f7d258b66740d785cc30abe79 "#overflowed-extensions-list" ); -@@ -2661,37 +2661,41 @@ var gUnifiedExtensions = { +@@ -2660,37 +2660,41 @@ var gUnifiedExtensions = { ); template.replaceWith(template.content); this._panel = document.getElementById("unified-extensions-panel"); @@ -123,7 +123,7 @@ index 098cf2408bc462f61fb547716754a3af832ffa1e..d062d03f7d258b66740d785cc30abe79 if (!CustomizationHandler.isCustomizing()) { if (aEvent) { if ( -@@ -2713,6 +2717,7 @@ var gUnifiedExtensions = { +@@ -2712,6 +2716,7 @@ var gUnifiedExtensions = { // and no alternative content is available for display in the panel. const policies = this.getActivePolicies(); if ( @@ -131,7 +131,7 @@ index 098cf2408bc462f61fb547716754a3af832ffa1e..d062d03f7d258b66740d785cc30abe79 policies.length && !this.hasExtensionsInPanel(policies) && !this.isPrivateWindowMissingExtensionsWithoutPBMAccess() && -@@ -2728,32 +2733,30 @@ var gUnifiedExtensions = { +@@ -2727,32 +2732,30 @@ var gUnifiedExtensions = { this.blocklistAttentionInfo = await AddonManager.getBlocklistAttentionInfo(); @@ -170,7 +170,7 @@ index 098cf2408bc462f61fb547716754a3af832ffa1e..d062d03f7d258b66740d785cc30abe79 triggerEvent: aEvent, }); } -@@ -2948,18 +2951,20 @@ var gUnifiedExtensions = { +@@ -2947,18 +2950,20 @@ var gUnifiedExtensions = { this._maybeMoveWidgetNodeBack(widgetId); } diff --git a/src/browser/base/content/browser-commands-js.patch b/src/browser/base/content/browser-commands-js.patch index 47fc89a6b..cebf5cd5b 100644 --- a/src/browser/base/content/browser-commands-js.patch +++ b/src/browser/base/content/browser-commands-js.patch @@ -1,8 +1,8 @@ diff --git a/browser/base/content/browser-commands.js b/browser/base/content/browser-commands.js -index e7f88f69fcc22efca4c7fc0363b9fe2729e1be6f..d7c4063d38576a34545b9af06c37937dc9090628 100644 +index 2d9f5591c9ffdd5948298555c461850521c0b45f..c46072ca4e96b419987f7e782e26b3de71d7c8e3 100644 --- a/browser/base/content/browser-commands.js +++ b/browser/base/content/browser-commands.js -@@ -14,6 +14,10 @@ var BrowserCommands = { +@@ -13,6 +13,10 @@ var BrowserCommands = { const where = BrowserUtils.whereToOpenLink(aEvent, false, true); if (where == "current") { @@ -13,7 +13,7 @@ index e7f88f69fcc22efca4c7fc0363b9fe2729e1be6f..d7c4063d38576a34545b9af06c37937d try { gBrowser.goBack(); } catch (ex) {} -@@ -229,6 +233,10 @@ var BrowserCommands = { +@@ -234,6 +238,10 @@ var BrowserCommands = { } } @@ -24,7 +24,7 @@ index e7f88f69fcc22efca4c7fc0363b9fe2729e1be6f..d7c4063d38576a34545b9af06c37937d // A notification intended to be useful for modular peformance tracking // starting as close as is reasonably possible to the time when the user // expressed the intent to open a new tab. Since there are a lot of -@@ -313,6 +321,14 @@ var BrowserCommands = { +@@ -318,6 +326,14 @@ var BrowserCommands = { return; } @@ -39,7 +39,7 @@ index e7f88f69fcc22efca4c7fc0363b9fe2729e1be6f..d7c4063d38576a34545b9af06c37937d // Keyboard shortcuts that would close a tab that is pinned select the first // unpinned tab instead. if ( -@@ -320,8 +336,8 @@ var BrowserCommands = { +@@ -325,8 +341,8 @@ var BrowserCommands = { (event.ctrlKey || event.metaKey || event.altKey) && gBrowser.selectedTab.pinned ) { diff --git a/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch b/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch index 3a25805c0..777274801 100644 --- a/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch +++ b/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch @@ -1,8 +1,8 @@ diff --git a/browser/base/content/browser-fullScreenAndPointerLock.js b/browser/base/content/browser-fullScreenAndPointerLock.js -index cd46701e9f4b672f392533c9ecc1c8570c3b2c5a..beb992702ea90e0b81f7bda4a6c0522932e84dfe 100644 +index 1eaf79a4f6788c518a4759bbce81175fd5fba220..6fde5e944ad4a847180ca83a9e6f4fde20aa7b42 100644 --- a/browser/base/content/browser-fullScreenAndPointerLock.js +++ b/browser/base/content/browser-fullScreenAndPointerLock.js -@@ -464,8 +464,6 @@ var FullScreen = { +@@ -501,8 +501,6 @@ var FullScreen = { // don't need that kind of precision in our CSS. shiftSize = shiftSize.toFixed(2); let translate = shiftSize > 0 ? `0 ${shiftSize}px` : ""; diff --git a/src/browser/base/content/browser-init-js.patch b/src/browser/base/content/browser-init-js.patch index bb9a738a2..11ab8dcfa 100644 --- a/src/browser/base/content/browser-init-js.patch +++ b/src/browser/base/content/browser-init-js.patch @@ -1,8 +1,8 @@ diff --git a/browser/base/content/browser-init.js b/browser/base/content/browser-init.js -index b64d2f52ed1eb3d0b8aa86700bc082d3fc95152b..dd8636148d0646f6949d6279d70e20c09d8c7c17 100644 +index d09cf65931eda253b2a71131f42883ccf6eb5724..f617863dac8e07def02d1d4ef7e5ade1caf50df1 100644 --- a/browser/base/content/browser-init.js +++ b/browser/base/content/browser-init.js -@@ -252,6 +252,7 @@ var gBrowserInit = { +@@ -302,6 +302,7 @@ var gBrowserInit = { }, onLoad() { @@ -10,7 +10,7 @@ index b64d2f52ed1eb3d0b8aa86700bc082d3fc95152b..dd8636148d0646f6949d6279d70e20c0 gBrowser.addEventListener("DOMUpdateBlockedPopups", e => PopupAndRedirectBlockerObserver.handleEvent(e) ); -@@ -446,6 +447,7 @@ var gBrowserInit = { +@@ -496,6 +497,7 @@ var gBrowserInit = { this._handleURIToLoad(); diff --git a/src/browser/base/content/browser-js.patch b/src/browser/base/content/browser-js.patch index 9cddb9c5c..5885abc6a 100644 --- a/src/browser/base/content/browser-js.patch +++ b/src/browser/base/content/browser-js.patch @@ -1,8 +1,8 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js -index 942bb5688e98f66ad71560fb32e1ca26a8081edf..25ba741c35c49afbf4e6053df3a0a7296d3040d8 100644 +index d1ab42d59f05513ec60a7578b7acab44875c544c..8c3cd75704991b8572d3f13a936fddd2616b2946 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js -@@ -33,6 +33,7 @@ ChromeUtils.defineESModuleGetters(this, { +@@ -34,6 +34,7 @@ ChromeUtils.defineESModuleGetters(this, { "resource://gre/modules/ContextualIdentityService.sys.mjs", CustomizableUI: "moz-src:///browser/components/customizableui/CustomizableUI.sys.mjs", @@ -24,7 +24,7 @@ index 942bb5688e98f66ad71560fb32e1ca26a8081edf..25ba741c35c49afbf4e6053df3a0a729 if (backDisabled) { backCommand.removeAttribute("disabled"); } else { -@@ -3830,7 +3836,7 @@ function warnAboutClosingWindow() { +@@ -3715,7 +3721,7 @@ function warnAboutClosingWindow() { if (!isPBWindow && !toolbar.visible) { return gBrowser.warnAboutClosingTabs( @@ -33,7 +33,7 @@ index 942bb5688e98f66ad71560fb32e1ca26a8081edf..25ba741c35c49afbf4e6053df3a0a729 gBrowser.closingTabsEnum.ALL ); } -@@ -3870,7 +3876,7 @@ function warnAboutClosingWindow() { +@@ -3755,7 +3761,7 @@ function warnAboutClosingWindow() { return ( isPBWindow || gBrowser.warnAboutClosingTabs( @@ -42,7 +42,7 @@ index 942bb5688e98f66ad71560fb32e1ca26a8081edf..25ba741c35c49afbf4e6053df3a0a729 gBrowser.closingTabsEnum.ALL ) ); -@@ -3895,7 +3901,7 @@ function warnAboutClosingWindow() { +@@ -3780,7 +3786,7 @@ function warnAboutClosingWindow() { AppConstants.platform != "macosx" || isPBWindow || gBrowser.warnAboutClosingTabs( @@ -51,7 +51,7 @@ index 942bb5688e98f66ad71560fb32e1ca26a8081edf..25ba741c35c49afbf4e6053df3a0a729 gBrowser.closingTabsEnum.ALL ) ); -@@ -4835,6 +4841,9 @@ var ConfirmationHint = { +@@ -4720,6 +4726,9 @@ var ConfirmationHint = { } document.l10n.setAttributes(this._message, messageId, options.l10nArgs); diff --git a/src/browser/base/content/browser-places-js.patch b/src/browser/base/content/browser-places-js.patch index 15472a9f3..e7ccfe59b 100644 --- a/src/browser/base/content/browser-places-js.patch +++ b/src/browser/base/content/browser-places-js.patch @@ -1,5 +1,5 @@ diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js -index 543630b89bc4f1d40eda7e4e7ae68a3c9f45e1e7..fac68af45985ad2feeb1daebd470d028b49d1dde 100644 +index e3feaebc551bfe7127b9701a7f76996022516af0..460b39f2a9f1f36d4b821c693951214098b644f7 100644 --- a/browser/base/content/browser-places.js +++ b/browser/base/content/browser-places.js @@ -261,6 +261,8 @@ var StarUI = { @@ -33,7 +33,7 @@ index 543630b89bc4f1d40eda7e4e7ae68a3c9f45e1e7..fac68af45985ad2feeb1daebd470d028 removeBookmarkButtonCommand: function SU_removeBookmarkButtonCommand() { this._removeBookmarksOnPopupHidden = true; this.panel.hidePopup(); -@@ -1811,6 +1828,7 @@ var BookmarkingUI = { +@@ -1815,6 +1832,7 @@ var BookmarkingUI = { document.getElementById("context-bookmarkpage"), PanelMultiView.getViewNode(document, "panelMenuBookmarkThisPage"), document.getElementById("pageAction-panel-bookmark"), diff --git a/src/browser/base/content/browser-sets-inc-xhtml.patch b/src/browser/base/content/browser-sets-inc-xhtml.patch new file mode 100644 index 000000000..7413314e3 --- /dev/null +++ b/src/browser/base/content/browser-sets-inc-xhtml.patch @@ -0,0 +1,9 @@ +diff --git a/browser/base/content/browser-sets.inc.xhtml b/browser/base/content/browser-sets.inc.xhtml +index 1263856344c4613ea58639a64e747fd0c3f771f7..c83ed7dd6a2482354c5bd37ce2e2cbf88ee6cf60 100644 +--- a/browser/base/content/browser-sets.inc.xhtml ++++ b/browser/base/content/browser-sets.inc.xhtml +@@ -418,3 +418,4 @@ + internal="true"/> + #endif + ++#include zen-keysets.inc.xhtml diff --git a/src/browser/base/content/browser-sets-inc.patch b/src/browser/base/content/browser-sets-inc.patch deleted file mode 100644 index bc6e0e638..000000000 --- a/src/browser/base/content/browser-sets-inc.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc -index 8871fc984acccfd9c54c7aef9f91934d81ba00c0..923ab3bda423eae77518f437221c32ca4990f5ce 100644 ---- a/browser/base/content/browser-sets.inc -+++ b/browser/base/content/browser-sets.inc -@@ -415,3 +415,4 @@ - internal="true"/> - #endif - -+#include zen-keysets.inc.xhtml diff --git a/src/browser/base/content/browser-sets-js.patch b/src/browser/base/content/browser-sets-js.patch index b8e1e993c..b5f52dbdf 100644 --- a/src/browser/base/content/browser-sets-js.patch +++ b/src/browser/base/content/browser-sets-js.patch @@ -1,8 +1,8 @@ diff --git a/browser/base/content/browser-sets.js b/browser/base/content/browser-sets.js -index d9ab2ad00b862d56ea7aa8e2469d050d8df7f5dc..2efb25ff9cfd3a224724fffadfa0aee693ddf47d 100644 +index 8b153dfac9421f0cce716ed399f33ec9b25eb311..5e461b0fc89455d38869ac70a7ce6a3b20ffd26b 100644 --- a/browser/base/content/browser-sets.js +++ b/browser/base/content/browser-sets.js -@@ -272,7 +272,7 @@ document.addEventListener( +@@ -285,7 +285,7 @@ document.addEventListener( } }); @@ -11,7 +11,7 @@ index d9ab2ad00b862d56ea7aa8e2469d050d8df7f5dc..2efb25ff9cfd3a224724fffadfa0aee6 const SIDEBAR_REVAMP_PREF = "sidebar.revamp"; const SIDEBAR_REVAMP_ENABLED = Services.prefs.getBoolPref( SIDEBAR_REVAMP_PREF, -@@ -310,6 +310,8 @@ document.addEventListener( +@@ -323,6 +323,8 @@ document.addEventListener( panel: SidebarController.currentID, opened: SidebarController._state.launcherExpanded, }); diff --git a/src/browser/base/content/browser-xhtml.patch b/src/browser/base/content/browser-xhtml.patch index 0dfd8f916..3785d2f33 100644 --- a/src/browser/base/content/browser-xhtml.patch +++ b/src/browser/base/content/browser-xhtml.patch @@ -1,8 +1,8 @@ diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml -index b42287485c2baeabe831b0d54c6f09330b0caabd..e404c2e028e24eb4fa9b97f143ba476c1b1461fd 100644 +index d8ed09dca6c8ae99ed1a84cef22462a0d7b517fe..dcb65c4268913fdf32302c9b4ac723131187922e 100644 --- a/browser/base/content/browser.xhtml +++ b/browser/base/content/browser.xhtml -@@ -19,6 +19,7 @@ +@@ -18,6 +18,7 @@ sizemode="normal" retargetdocumentfocus="urlbar-input" scrolling="false" @@ -10,7 +10,7 @@ index b42287485c2baeabe831b0d54c6f09330b0caabd..e404c2e028e24eb4fa9b97f143ba476c persist="screenX screenY width height sizemode" data-l10n-sync="true"> -@@ -101,8 +102,10 @@ +@@ -100,8 +101,10 @@ @@ -21,7 +21,7 @@ index b42287485c2baeabe831b0d54c6f09330b0caabd..e404c2e028e24eb4fa9b97f143ba476c # All sets except for popupsets (commands, keys, and stringbundles) -@@ -135,9 +138,10 @@ +@@ -134,9 +137,10 @@ diff --git a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch index 604d54485..32856a975 100644 --- a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch +++ b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch @@ -1,5 +1,5 @@ diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml -index edeb473e46b3aa4b12eb4b59ce62e5ae48edd2a1..99210f8bb5633d50d2cba24f1e13ca866c5b6959 100644 +index b4abfb868fc7c13e789acb57b44e386de6d31bf0..ad917f5362ed4f3ba0149c214fb53d3f087bbfcf 100644 --- a/browser/base/content/navigator-toolbox.inc.xhtml +++ b/browser/base/content/navigator-toolbox.inc.xhtml @@ -2,7 +2,7 @@ @@ -12,7 +12,7 @@ index edeb473e46b3aa4b12eb4b59ce62e5ae48edd2a1..99210f8bb5633d50d2cba24f1e13ca86 @@ -18,9 +18,13 @@ - #include browser-menubar.inc + #include browser-menubar.inc.xhtml -#include titlebar-items.inc.xhtml @@ -43,7 +43,7 @@ index edeb473e46b3aa4b12eb4b59ce62e5ae48edd2a1..99210f8bb5633d50d2cba24f1e13ca86 diff --git a/src/browser/base/content/navigator-toolbox-js.patch b/src/browser/base/content/navigator-toolbox-js.patch index b1d06369c..eb9f6b8ee 100644 --- a/src/browser/base/content/navigator-toolbox-js.patch +++ b/src/browser/base/content/navigator-toolbox-js.patch @@ -1,8 +1,8 @@ diff --git a/browser/base/content/navigator-toolbox.js b/browser/base/content/navigator-toolbox.js -index 362a85c20d8f0633fa78f85578e4cf015fdd0e44..ef7d6ff9e0e9876bc1918e365fd0addcd177cecb 100644 +index 1982ebadbd2df5ea309db487a4f30288f1af43e5..926c681d4733c84768a23407d60ca05859408b6d 100644 --- a/browser/base/content/navigator-toolbox.js +++ b/browser/base/content/navigator-toolbox.js -@@ -11,7 +11,7 @@ ChromeUtils.defineESModuleGetters(this, { +@@ -10,7 +10,7 @@ ChromeUtils.defineESModuleGetters(this, { document.addEventListener( "DOMContentLoaded", () => { @@ -11,7 +11,7 @@ index 362a85c20d8f0633fa78f85578e4cf015fdd0e44..ef7d6ff9e0e9876bc1918e365fd0addc const widgetOverflow = document.getElementById("widget-overflow"); function onPopupShowing(event) { -@@ -189,6 +189,7 @@ document.addEventListener( +@@ -188,6 +188,7 @@ document.addEventListener( #forward-button, #reload-button , #reader-mode-button, @@ -19,7 +19,7 @@ index 362a85c20d8f0633fa78f85578e4cf015fdd0e44..ef7d6ff9e0e9876bc1918e365fd0addc #picture-in-picture-button, #urlbar-zoom-button, #star-button-box, -@@ -215,6 +216,17 @@ document.addEventListener( +@@ -214,6 +215,17 @@ document.addEventListener( gBrowser.handleNewTabMiddleClick(element, event); break; @@ -37,7 +37,7 @@ index 362a85c20d8f0633fa78f85578e4cf015fdd0e44..ef7d6ff9e0e9876bc1918e365fd0addc case "back-button": case "forward-button": case "reload-button": -@@ -330,6 +342,7 @@ document.addEventListener( +@@ -329,6 +341,7 @@ document.addEventListener( #downloads-button, #fxa-toolbar-menu-button, #unified-extensions-button, @@ -45,7 +45,7 @@ index 362a85c20d8f0633fa78f85578e4cf015fdd0e44..ef7d6ff9e0e9876bc1918e365fd0addc #library-button, #split-view-button, #smartwindow-ask-button -@@ -414,6 +427,16 @@ document.addEventListener( +@@ -413,6 +426,16 @@ document.addEventListener( gUnifiedExtensions.togglePanel(event); break; diff --git a/src/browser/base/content/nsContextMenu-sys-mjs.patch b/src/browser/base/content/nsContextMenu-sys-mjs.patch index f33538f18..96ce57ca7 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 5ee0ee4246d1c267b75328666a7f7f54e6f93246..ae778b88e1d295cdae2d0433d943ac467081b126 100644 +index 97cb36e2ed48d00454e169fb0470b47ac994b883..1811a92885620c8a916937f467ebb7d0eb0d3a0e 100644 --- a/browser/base/content/nsContextMenu.sys.mjs +++ b/browser/base/content/nsContextMenu.sys.mjs -@@ -370,6 +370,9 @@ export class nsContextMenu { +@@ -369,6 +369,9 @@ export class nsContextMenu { this.initTextFragmentItems(); this.pdfjsContextMenu.initItems(); diff --git a/src/browser/base/moz-build.patch b/src/browser/base/moz-build.patch index d4813485e..879d6fc70 100644 --- a/src/browser/base/moz-build.patch +++ b/src/browser/base/moz-build.patch @@ -1,8 +1,8 @@ diff --git a/browser/base/moz.build b/browser/base/moz.build -index 086b462e706bb46727d0fed85b4c98debaeaf721..44a4fcb9b8181678667ee11b0443eed681dd2a43 100644 +index 286e17552e2ab2d7e44c6ba99c84630cadd24e94..076f813aea971db1e1c1429fc0b64c1784a22722 100644 --- a/browser/base/moz.build +++ b/browser/base/moz.build -@@ -82,3 +82,5 @@ DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"] +@@ -78,3 +78,5 @@ DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"] DEFINES["APP_LICENSE_BLOCK"] = "%s/content/overrides/app-license.html" % SRCDIR JAR_MANIFESTS += ["jar.mn"] diff --git a/src/browser/components/BrowserContentHandler-sys-mjs.patch b/src/browser/components/BrowserContentHandler-sys-mjs.patch index 53361dad7..8e7db1a5d 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 2152327b42c884456785ef065422e3ca6cc8c50b..932150495d23c0a63987abf14b3dc8a12eb42d6c 100644 +index 430c6877c81824d8ab318cacc997d4eda4cb6a11..e8a195e1fe09952b90a0d73d13c6c15da2006bd4 100644 --- a/browser/components/BrowserContentHandler.sys.mjs +++ b/browser/components/BrowserContentHandler.sys.mjs @@ -603,6 +603,28 @@ nsBrowserContentHandler.prototype = { diff --git a/src/browser/components/BrowserGlue-sys-mjs.patch b/src/browser/components/BrowserGlue-sys-mjs.patch index 8a51e3ffa..80870a8e2 100644 --- a/src/browser/components/BrowserGlue-sys-mjs.patch +++ b/src/browser/components/BrowserGlue-sys-mjs.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs -index 75cdab491d35dc30be6c0a4ec6ab88e6fb4239aa..9c26fb1d6032bdecd6c552bd25694f45e3822d50 100644 +index af635211046f9f1b2d473a14e8170837cd0d93cd..f07514a7e3ab55aa3321f0a7c0c092e91c2961ce 100644 --- a/browser/components/BrowserGlue.sys.mjs +++ b/browser/components/BrowserGlue.sys.mjs @@ -8,6 +8,7 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; @@ -10,7 +10,7 @@ index 75cdab491d35dc30be6c0a4ec6ab88e6fb4239aa..9c26fb1d6032bdecd6c552bd25694f45 AboutHomeStartupCache: "resource:///modules/AboutHomeStartupCache.sys.mjs", AWToolbarButton: "resource:///modules/aboutwelcome/AWToolbarUtils.sys.mjs", ASRouter: "resource:///modules/asrouter/ASRouter.sys.mjs", -@@ -1457,7 +1458,7 @@ BrowserGlue.prototype = { +@@ -1458,7 +1459,7 @@ BrowserGlue.prototype = { windowcount++; let tabbrowser = win.gBrowser; if (tabbrowser) { @@ -19,7 +19,7 @@ index 75cdab491d35dc30be6c0a4ec6ab88e6fb4239aa..9c26fb1d6032bdecd6c552bd25694f45 } } -@@ -1622,6 +1623,8 @@ BrowserGlue.prototype = { +@@ -1623,6 +1624,8 @@ BrowserGlue.prototype = { } else if (profileDataVersion < APP_DATA_VERSION) { lazy.ProfileDataUpgrader.upgrade(profileDataVersion, APP_DATA_VERSION); } diff --git a/src/browser/components/aboutwelcome/content/aboutwelcome-css.patch b/src/browser/components/aboutwelcome/content/aboutwelcome-css.patch index 62ca1a030..076942b7b 100644 --- a/src/browser/components/aboutwelcome/content/aboutwelcome-css.patch +++ b/src/browser/components/aboutwelcome/content/aboutwelcome-css.patch @@ -1,8 +1,8 @@ diff --git a/browser/components/aboutwelcome/content/aboutwelcome.css b/browser/components/aboutwelcome/content/aboutwelcome.css -index e5bbb4c217ae7b05a2da79b332d72cc5429f061f..ea44d83dd0825a3bc950f6005025498644c7fc67 100644 +index 98497769b135efd3200607ee2cf50e82d06ed3fd..68e0778cfc4dc70935a3d48e79542b4133b293d2 100644 --- a/browser/components/aboutwelcome/content/aboutwelcome.css +++ b/browser/components/aboutwelcome/content/aboutwelcome.css -@@ -331,6 +331,11 @@ panel#feature-callout { +@@ -330,6 +330,11 @@ panel#feature-callout { --panel-shadow-margin: 6px; --panel-arrow-space: calc(var(--panel-shadow-margin) + var(--arrow-visible-height) - 1.5px); --panel-margin-offset: calc(-1 * (var(--panel-shadow-margin) + var(--arrow-corner-distance) + (var(--arrow-width) / 2))); @@ -14,7 +14,7 @@ index e5bbb4c217ae7b05a2da79b332d72cc5429f061f..ea44d83dd0825a3bc950f60050254986 } panel#feature-callout::part(content) { -@@ -518,6 +523,12 @@ div#feature-callout.hidden { +@@ -517,6 +522,12 @@ div#feature-callout.hidden { width: 25em; gap: 16px; background: var(--fc-background); @@ -27,7 +27,7 @@ index e5bbb4c217ae7b05a2da79b332d72cc5429f061f..ea44d83dd0825a3bc950f60050254986 } #feature-callout .screen[pos=callout] .section-main .main-content .main-content-inner { gap: 12px; -@@ -850,6 +861,10 @@ panel#feature-callout::part(content) { +@@ -933,6 +944,10 @@ panel#feature-callout::part(content) { overflow: visible; transform: rotate(45deg); transform-style: preserve-3d; diff --git a/src/browser/components/aiwindow/ui/modules/AIWindow-sys-mjs.patch b/src/browser/components/aiwindow/ui/modules/AIWindow-sys-mjs.patch index 23b0a7ae5..f8d9df869 100644 --- a/src/browser/components/aiwindow/ui/modules/AIWindow-sys-mjs.patch +++ b/src/browser/components/aiwindow/ui/modules/AIWindow-sys-mjs.patch @@ -1,8 +1,8 @@ diff --git a/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs b/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs -index 4081f59d041e91291d5e6b6b8c9ad96db5b6b2dc..d420a2fe4ca552b7f24ce9fbefc5f7302d7f2c8e 100644 +index 97710ab0570a1a477ef4ed74a78c16448dfb7674..7d8ba5b1f2f330175fb57b906bb572fd7e1d36c8 100644 --- a/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs +++ b/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs -@@ -269,6 +269,7 @@ export const AIWindow = { +@@ -277,6 +277,7 @@ export const AIWindow = { }, _updateToolbarButtonPositions(win, { isToggling = false } = {}) { diff --git a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch index 5ad20a2b4..4b057e3d2 100644 --- a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch +++ b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch @@ -1,8 +1,8 @@ diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs -index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d89ee6ce1d 100644 +index 5905271a3343efa04b45f5d1a63bfca3de342755..af76922c1ba0b35a0072ec044f7d0860f9295d9d 100644 --- a/browser/components/customizableui/CustomizableUI.sys.mjs +++ b/browser/components/customizableui/CustomizableUI.sys.mjs -@@ -14,6 +14,7 @@ ChromeUtils.defineESModuleGetters(lazy, { +@@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, { BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.sys.mjs", CustomizableWidgets: "moz-src:///browser/components/customizableui/CustomizableWidgets.sys.mjs", @@ -10,7 +10,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8 HomePage: "resource:///modules/HomePage.sys.mjs", PanelMultiView: "moz-src:///browser/components/customizableui/PanelMultiView.sys.mjs", -@@ -348,7 +349,7 @@ var CustomizableUIInternal = { +@@ -347,7 +348,7 @@ var CustomizableUIInternal = { { type: CustomizableUI.TYPE_PANEL, defaultPlacements: [], @@ -19,7 +19,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8 }, false ); -@@ -358,20 +359,15 @@ var CustomizableUIInternal = { +@@ -357,20 +358,15 @@ var CustomizableUIInternal = { "back-button", "forward-button", "stop-reload-button", @@ -41,7 +41,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8 this.registerArea( CustomizableUI.AREA_NAVBAR, { -@@ -379,8 +375,6 @@ var CustomizableUIInternal = { +@@ -378,8 +374,6 @@ var CustomizableUIInternal = { overflowable: true, defaultPlacements: navbarPlacements, verticalTabsDefaultPlacements: [ @@ -50,7 +50,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8 ], defaultCollapsed: false, }, -@@ -404,10 +398,7 @@ var CustomizableUIInternal = { +@@ -403,10 +397,7 @@ var CustomizableUIInternal = { { type: CustomizableUI.TYPE_TOOLBAR, defaultPlacements: [ @@ -61,7 +61,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8 ], verticalTabsDefaultPlacements: [], defaultCollapsed: null, -@@ -489,6 +480,7 @@ var CustomizableUIInternal = { +@@ -486,6 +477,7 @@ var CustomizableUIInternal = { CustomizableUI.AREA_NAVBAR, CustomizableUI.AREA_BOOKMARKS, CustomizableUI.AREA_TABSTRIP, @@ -69,7 +69,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8 ]); if (AppConstants.platform != "macosx") { toolbars.add(CustomizableUI.AREA_MENUBAR); -@@ -1265,6 +1257,9 @@ var CustomizableUIInternal = { +@@ -1262,6 +1254,9 @@ var CustomizableUIInternal = { placements = gPlacements.get(area); } @@ -79,7 +79,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8 // For toolbars that need it, mark as dirty. let defaultPlacements = areaProperties.get("defaultPlacements"); if ( -@@ -1772,7 +1767,6 @@ var CustomizableUIInternal = { +@@ -1769,7 +1764,6 @@ var CustomizableUIInternal = { lazy.log.info( "Widget " + aWidgetId + " not found, unable to remove from " + aArea ); @@ -87,7 +87,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8 } this.notifyDOMChange(widgetNode, null, container, true, () => { -@@ -1782,7 +1776,7 @@ var CustomizableUIInternal = { +@@ -1779,7 +1773,7 @@ var CustomizableUIInternal = { // We also need to remove the panel context menu if it's there: this.ensureButtonContextMenu(widgetNode); if (gPalette.has(aWidgetId) || this.isSpecialWidget(aWidgetId)) { @@ -96,7 +96,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8 } else { window.gNavToolbox.palette.appendChild(widgetNode); } -@@ -1950,16 +1944,16 @@ var CustomizableUIInternal = { +@@ -1947,16 +1941,16 @@ var CustomizableUIInternal = { elem.setAttribute("skipintoolbarset", "true"); } } @@ -116,7 +116,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8 // Handle initial state of vertical tabs. if (isVerticalTabs) { // Show the vertical tabs toolbar -@@ -2201,6 +2195,10 @@ var CustomizableUIInternal = { +@@ -2198,6 +2192,10 @@ var CustomizableUIInternal = { * The identifier string of the area that aNode is being inserted into. */ insertWidgetBefore(aNode, aNextNode, aContainer, aAreaId) { @@ -127,7 +127,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8 this.notifyDOMChange(aNode, aNextNode, aContainer, false, () => { this.setLocationAttributes(aNode, aAreaId); aContainer.insertBefore(aNode, aNextNode); -@@ -4565,7 +4563,7 @@ var CustomizableUIInternal = { +@@ -4562,7 +4560,7 @@ var CustomizableUIInternal = { * For all registered areas, builds those areas to reflect the current * placement state of all widgets. */ @@ -136,7 +136,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8 for (let [areaId, areaNodes] of gBuildAreas) { let placements = gPlacements.get(areaId); let isFirstChangedToolbar = true; -@@ -4576,7 +4574,7 @@ var CustomizableUIInternal = { +@@ -4573,7 +4571,7 @@ var CustomizableUIInternal = { if (area.get("type") == CustomizableUI.TYPE_TOOLBAR) { let defaultCollapsed = area.get("defaultCollapsed"); let win = areaNode.ownerGlobal; @@ -145,7 +145,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8 win.setToolbarVisibility( areaNode, typeof defaultCollapsed == "string" -@@ -5867,6 +5865,7 @@ export var CustomizableUI = { +@@ -5864,6 +5862,7 @@ export var CustomizableUI = { unregisterArea(aName, aDestroyPlacements) { CustomizableUIInternal.unregisterArea(aName, aDestroyPlacements); }, @@ -153,7 +153,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8 /** * Add a widget to an area. * If the area to which you try to add is not known to CustomizableUI, -@@ -7830,7 +7829,9 @@ class OverflowableToolbar { +@@ -7827,7 +7826,9 @@ class OverflowableToolbar { ); if (webExtList && CustomizableUI.isWebExtensionWidget(child.id)) { @@ -163,7 +163,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8 webExtList.insertBefore(child, webExtList.firstElementChild); } else { child.setAttribute("cui-anchorid", this.#defaultListButton.id); -@@ -7890,7 +7891,7 @@ class OverflowableToolbar { +@@ -7887,7 +7888,7 @@ class OverflowableToolbar { ) { continue; } @@ -172,7 +172,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8 if (child != aExceptChild) { sum += getInlineSize(child); } -@@ -7914,11 +7915,11 @@ class OverflowableToolbar { +@@ -7911,11 +7912,11 @@ class OverflowableToolbar { parseFloat(style.paddingLeft) - parseFloat(style.paddingRight) - toolbarChildrenWidth; @@ -186,7 +186,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8 }); lazy.log.debug( -@@ -7933,7 +7934,37 @@ class OverflowableToolbar { +@@ -7930,7 +7931,37 @@ class OverflowableToolbar { Math.max(targetWidth, targetChildrenWidth) ); totalAvailWidth = Math.ceil(totalAvailWidth); @@ -225,7 +225,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8 return { isOverflowing, targetContentWidth, totalAvailWidth }; } -@@ -7994,7 +8025,11 @@ class OverflowableToolbar { +@@ -7991,7 +8022,11 @@ class OverflowableToolbar { return; } } @@ -238,7 +238,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8 lazy.log.debug( `Need ${minSize} but width is ${totalAvailWidth} so bailing` ); -@@ -8027,7 +8062,7 @@ class OverflowableToolbar { +@@ -8024,7 +8059,7 @@ class OverflowableToolbar { } } if (!inserted) { @@ -247,7 +247,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8 } child.removeAttribute("cui-anchorid"); child.removeAttribute("overflowedItem"); -@@ -8153,6 +8188,9 @@ class OverflowableToolbar { +@@ -8150,6 +8185,9 @@ class OverflowableToolbar { * if no such list exists. */ get #webExtList() { @@ -257,7 +257,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8 if (!this.#webExtListRef) { let targetID = this.#toolbar.getAttribute("addon-webext-overflowtarget"); if (!targetID) { -@@ -8164,6 +8202,9 @@ class OverflowableToolbar { +@@ -8161,6 +8199,9 @@ class OverflowableToolbar { let win = this.#toolbar.ownerGlobal; let { panel } = win.gUnifiedExtensions; this.#webExtListRef = panel.querySelector(`#${targetID}`); @@ -267,7 +267,7 @@ index db617c65b89643015d91b0f6a20eab7d7a1b598f..53598363bfbc2c5de4c6b4de712d22d8 } return this.#webExtListRef; } -@@ -8372,7 +8413,7 @@ class OverflowableToolbar { +@@ -8369,7 +8410,7 @@ class OverflowableToolbar { break; } case "mousedown": { diff --git a/src/browser/components/customizableui/content/panelUI-js.patch b/src/browser/components/customizableui/content/panelUI-js.patch index ac98d08a2..2b3f0d054 100644 --- a/src/browser/components/customizableui/content/panelUI-js.patch +++ b/src/browser/components/customizableui/content/panelUI-js.patch @@ -1,8 +1,8 @@ diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js -index 5056ff7fba62f8340c58cbaa30833aad12b4fc70..32dbd206cbc8576ec5a5f958f43670fa90c050b8 100644 +index 5a469ce153dada011144fb4b66747c41e778ff1e..83bedb74df5b4064e8a0580f8b2ee9c0c27f81a8 100644 --- a/browser/components/customizableui/content/panelUI.js +++ b/browser/components/customizableui/content/panelUI.js -@@ -647,10 +647,12 @@ const PanelUI = { +@@ -666,10 +666,12 @@ const PanelUI = { if (hasKids && !this.navbar.hasAttribute("nonemptyoverflow")) { this.navbar.setAttribute("nonemptyoverflow", "true"); this.overflowPanel.setAttribute("hasfixeditems", "true"); @@ -15,7 +15,7 @@ index 5056ff7fba62f8340c58cbaa30833aad12b4fc70..32dbd206cbc8576ec5a5f958f43670fa } }, -@@ -998,7 +1000,7 @@ const PanelUI = { +@@ -1017,7 +1019,7 @@ const PanelUI = { el.removeAttribute("data-lazy-l10n-id"); }); diff --git a/src/browser/components/extensions/parent/ext-browser-js.patch b/src/browser/components/extensions/parent/ext-browser-js.patch index 1c6064321..884ddfa16 100644 --- a/src/browser/components/extensions/parent/ext-browser-js.patch +++ b/src/browser/components/extensions/parent/ext-browser-js.patch @@ -1,8 +1,8 @@ diff --git a/browser/components/extensions/parent/ext-browser.js b/browser/components/extensions/parent/ext-browser.js -index 3ce6ae3271bb0b3873118a94363a9552877559f8..9e62181986d039cc171dfe87de1d95c1f5aacd8c 100644 +index d1209bc2c828a19ade8cc027cdea6f42007f0de6..0a2def2f3c32618304cd8a263906b0c6e040dcbc 100644 --- a/browser/components/extensions/parent/ext-browser.js +++ b/browser/components/extensions/parent/ext-browser.js -@@ -354,6 +354,7 @@ class TabTracker extends TabTrackerBase { +@@ -352,6 +352,7 @@ class TabTracker extends TabTrackerBase { } getId(nativeTab) { @@ -10,7 +10,7 @@ index 3ce6ae3271bb0b3873118a94363a9552877559f8..9e62181986d039cc171dfe87de1d95c1 let id = this._tabs.get(nativeTab); if (id) { return id; -@@ -388,6 +389,7 @@ class TabTracker extends TabTrackerBase { +@@ -386,6 +387,7 @@ class TabTracker extends TabTrackerBase { if (nativeTab.ownerGlobal.closed) { throw new Error("Cannot attach ID to a tab in a closed window."); } @@ -18,7 +18,7 @@ index 3ce6ae3271bb0b3873118a94363a9552877559f8..9e62181986d039cc171dfe87de1d95c1 this._tabs.set(nativeTab, id); if (nativeTab.linkedBrowser) { -@@ -1278,6 +1280,10 @@ class TabManager extends TabManagerBase { +@@ -1276,6 +1278,10 @@ class TabManager extends TabManagerBase { } canAccessTab(nativeTab) { diff --git a/src/browser/components/extensions/parent/ext-tabs-js.patch b/src/browser/components/extensions/parent/ext-tabs-js.patch index c5018699e..6c6573342 100644 --- a/src/browser/components/extensions/parent/ext-tabs-js.patch +++ b/src/browser/components/extensions/parent/ext-tabs-js.patch @@ -1,8 +1,8 @@ diff --git a/browser/components/extensions/parent/ext-tabs.js b/browser/components/extensions/parent/ext-tabs.js -index ae004ad48e86aae9d13fc6aa5f77f3095763f829..1e3d14a5c6fcbebbc677e0e57ef2b2176a141a3c 100644 +index 636e0f8cd1d489658833cf101152576e9fdb52af..e7578a059504b89a852061be037c323a107fe5ce 100644 --- a/browser/components/extensions/parent/ext-tabs.js +++ b/browser/components/extensions/parent/ext-tabs.js -@@ -516,6 +516,7 @@ this.tabs = class extends ExtensionAPIPersistent { +@@ -514,6 +514,7 @@ this.tabs = class extends ExtensionAPIPersistent { } let tab = tabManager.getWrapper(updatedTab); @@ -10,7 +10,7 @@ index ae004ad48e86aae9d13fc6aa5f77f3095763f829..1e3d14a5c6fcbebbc677e0e57ef2b217 let changeInfo = {}; for (let prop of needed) { -@@ -881,6 +882,7 @@ this.tabs = class extends ExtensionAPIPersistent { +@@ -883,6 +884,7 @@ this.tabs = class extends ExtensionAPIPersistent { }); } diff --git a/src/browser/components/places/PlacesUIUtils-sys-mjs.patch b/src/browser/components/places/PlacesUIUtils-sys-mjs.patch index faddca8d4..82c5b5b14 100644 --- a/src/browser/components/places/PlacesUIUtils-sys-mjs.patch +++ b/src/browser/components/places/PlacesUIUtils-sys-mjs.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/places/PlacesUIUtils.sys.mjs b/browser/components/places/PlacesUIUtils.sys.mjs -index 2db11dad245dccca246cc8429a7498af9f143d5f..980ec44d9e92639b249bc83f59ea3bfae40dd921 100644 +index b21f7721dea2d485ccba1fd6fd7e65e17480e3d3..89048d9ea2b4edf2b0cab77f661c07f4d9453c3f 100644 --- a/browser/components/places/PlacesUIUtils.sys.mjs +++ b/browser/components/places/PlacesUIUtils.sys.mjs @@ -61,6 +61,7 @@ class BookmarkState { diff --git a/src/browser/components/places/content/browserPlacesViews-js.patch b/src/browser/components/places/content/browserPlacesViews-js.patch index aa584f20d..f19671911 100644 --- a/src/browser/components/places/content/browserPlacesViews-js.patch +++ b/src/browser/components/places/content/browserPlacesViews-js.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/places/content/browserPlacesViews.js b/browser/components/places/content/browserPlacesViews.js -index 384d599c58cefbf80f5a50489fc401df0c8de8a5..aa85972946c3ff7866fbea86b0372432fb02cd6f 100644 +index 463913926c58e6c622e0fcc60534921f02814829..0143c48c48e132464226db810f4ea4d2720c3c49 100644 --- a/browser/components/places/content/browserPlacesViews.js +++ b/browser/components/places/content/browserPlacesViews.js @@ -328,12 +328,23 @@ class PlacesViewBase { @@ -37,7 +37,7 @@ index 384d599c58cefbf80f5a50489fc401df0c8de8a5..aa85972946c3ff7866fbea86b0372432 } else if (PlacesUtils.containerTypes.includes(type)) { element = document.createXULElement("menu"); element.setAttribute("container", "true"); -@@ -1015,25 +1027,33 @@ class PlacesToolbar extends PlacesViewBase { +@@ -1058,25 +1070,33 @@ class PlacesToolbar extends PlacesViewBase { this._rootElt.firstChild.remove(); } @@ -82,7 +82,7 @@ index 384d599c58cefbf80f5a50489fc401df0c8de8a5..aa85972946c3ff7866fbea86b0372432 ); ++startIndex; if (elt.localName != "toolbarseparator") { -@@ -1041,15 +1061,12 @@ class PlacesToolbar extends PlacesViewBase { +@@ -1084,15 +1104,12 @@ class PlacesToolbar extends PlacesViewBase { } } if (!elt) { @@ -101,7 +101,7 @@ index 384d599c58cefbf80f5a50489fc401df0c8de8a5..aa85972946c3ff7866fbea86b0372432 }); }); -@@ -1059,7 +1076,7 @@ class PlacesToolbar extends PlacesViewBase { +@@ -1102,7 +1119,7 @@ class PlacesToolbar extends PlacesViewBase { let fragment = document.createDocumentFragment(); for (let i = startIndex; i < limit; ++i) { @@ -110,7 +110,7 @@ index 384d599c58cefbf80f5a50489fc401df0c8de8a5..aa85972946c3ff7866fbea86b0372432 } await new Promise(resolve => window.requestAnimationFrame(resolve)); if (!this._isAlive) { -@@ -1122,6 +1139,8 @@ class PlacesToolbar extends PlacesViewBase { +@@ -1165,6 +1182,8 @@ class PlacesToolbar extends PlacesViewBase { "scheme", PlacesUIUtils.guessUrlSchemeForUI(aChild.uri) ); @@ -119,7 +119,7 @@ index 384d599c58cefbf80f5a50489fc401df0c8de8a5..aa85972946c3ff7866fbea86b0372432 } } -@@ -2314,7 +2333,7 @@ this.PlacesPanelview = class PlacesPanelview extends PlacesViewBase { +@@ -2359,7 +2378,7 @@ this.PlacesPanelview = class PlacesPanelview extends PlacesViewBase { PlacesUIUtils.guessUrlSchemeForUI(placesNode.uri) ); element.setAttribute("label", PlacesUIUtils.getBestTitle(placesNode)); diff --git a/src/browser/components/preferences/dialogs/syncChooseWhatToSync-xhtml.patch b/src/browser/components/preferences/dialogs/syncChooseWhatToSync-xhtml.patch index ba16a42fc..3b0ab370d 100644 --- a/src/browser/components/preferences/dialogs/syncChooseWhatToSync-xhtml.patch +++ b/src/browser/components/preferences/dialogs/syncChooseWhatToSync-xhtml.patch @@ -1,8 +1,8 @@ diff --git a/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml b/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml -index ef127a1bc2e3ea4221b641156c38a74edb3b44ae..acd39fe7f6dc7ec03ea50928e2d002791b834dcf 100644 +index a893c5ec3d007820d98f5d92dd039640faa2c181..9cbd00102e44ccf98b37845474d92d57bac0842d 100644 --- a/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml +++ b/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml -@@ -27,6 +27,10 @@ +@@ -26,6 +26,10 @@ rel="localization" href="browser/preferences/preferences.ftl" /> @@ -13,7 +13,7 @@ index ef127a1bc2e3ea4221b641156c38a74edb3b44ae..acd39fe7f6dc7ec03ea50928e2d00279