From 20ea551c9b2337d851b65a1b9f84184e432cd1cd Mon Sep 17 00:00:00 2001 From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com> Date: Fri, 20 Mar 2026 12:48:24 +0100 Subject: [PATCH] no-bug: Sync upstream Firefox to version 149.0 (gh-12826) --- README.md | 2 +- build/firefox-cache/l10n-last-commit-hash | 2 +- prefs/firefox/browser.yaml | 3 + prefs/firefox/urlbar.yaml | 3 + prefs/zen/zen.yaml | 3 - src/-prettierignore.patch | 4 +- src/-stylelintrc-js.patch | 7 +- src/Cargo-lock.patch | 13 - src/Cargo-toml.patch | 13 - src/browser/actors/WebRTCParent-sys-mjs.patch | 2 +- .../base/content/browser-addons-js.patch | 22 +- .../base/content/browser-commands-js.patch | 2 +- .../browser-fullScreenAndPointerLock-js.patch | 10 +- .../base/content/browser-init-js.patch | 6 +- src/browser/base/content/browser-js.patch | 16 +- .../base/content/browser-places-js.patch | 8 +- .../base/content/browser-sets-inc.patch | 4 +- .../base/content/browser-sets-js.patch | 6 +- .../content/browser-siteIdentity-js.patch | 6 +- src/browser/base/content/browser-xhtml.patch | 2 +- .../content/navigator-toolbox-inc-xhtml.patch | 2 +- .../base/content/navigator-toolbox-js.patch | 16 +- .../base/content/nsContextMenu-sys-mjs.patch | 4 +- .../base/content/zen-preloaded.inc.xhtml | 1 - src/browser/base/jar-mn.patch | 4 +- .../components/BrowserGlue-sys-mjs.patch | 6 +- .../content/aboutwelcome-css.patch | 8 +- .../ui/modules/AIWindow-sys-mjs.patch | 12 + .../modules/FeatureCallout-sys-mjs.patch | 2 +- .../CustomizableUI-sys-mjs.patch | 48 +-- .../CustomizeMode-sys-mjs.patch | 2 +- .../ToolbarContextMenu-sys-mjs.patch | 4 +- .../customizableui/content/panelUI-js.patch | 2 +- .../extensions/parent/ext-browser-js.patch | 4 +- .../extensions/parent/ext-tabs-js.patch | 6 +- .../places/PlacesUIUtils-sys-mjs.patch | 14 +- .../content/bookmarkProperties-xhtml.patch | 2 +- .../content/browserPlacesViews-js.patch | 12 +- .../places/content/editBookmark-js.patch | 8 +- .../components/preferences/jar-mn.patch | 4 +- .../preferences/main-inc-xhtml.patch | 14 +- .../components/preferences/main-js.patch | 6 +- .../preferences/preferences-js.patch | 6 +- .../preferences/preferences-xhtml.patch | 10 +- .../preferences/sync-inc-xhtml.patch | 2 +- .../search/SearchOneOffs-sys-mjs.patch | 4 +- .../search/SearchUIUtils-sys-mjs.patch | 4 +- .../sessionstore/SessionStore-sys-mjs.patch | 72 ++-- .../sessionstore/TabGroupState-sys-mjs.patch | 4 +- .../sessionstore/TabState-sys-mjs.patch | 6 +- .../sidebar/browser-sidebar-js.patch | 4 +- .../tabbrowser/TabsList-sys-mjs.patch | 2 +- .../tabbrowser/content/drag-and-drop-js.patch | 166 ++++----- .../tabbrowser/content/tab-js.patch | 34 +- .../tabbrowser/content/tabbrowser-js.patch | 252 +++++++------- .../tabbrowser/content/tabgroup-js.patch | 25 +- .../tabbrowser/content/tabs-js.patch | 48 +-- .../urlbar/UrlbarController-sys-mjs.patch | 2 +- .../urlbar/UrlbarMuxerStandard-sys-mjs.patch | 4 +- .../urlbar/UrlbarPrefs-sys-mjs.patch | 2 +- ...barProviderHeuristicFallback-sys-mjs.patch | 4 +- .../UrlbarProvidersManager-sys-mjs.patch | 4 +- .../urlbar/UrlbarResult-sys-mjs.patch | 4 +- .../urlbar/UrlbarUtils-sys-mjs.patch | 8 +- .../urlbar/UrlbarValueFormatter-sys-mjs.patch | 8 +- .../newtab/lib/ActivityStream-sys-mjs.patch | 4 +- .../installer/package-manifest-in.patch | 4 +- .../windows/msix/AppxManifest-xml-in.patch | 12 - .../windows/nsis/installer-nsi.patch | 6 +- .../installer/windows/nsis/shared-nsh.patch | 48 --- .../windows/nsis/uninstaller-nsi.patch | 4 +- .../BrowserWindowTracker-sys-mjs.patch | 6 +- .../modules/ExtensionsUI-sys-mjs.patch | 4 +- .../modules/URILoadingHelper-sys-mjs.patch | 22 +- src/browser/themes/linux/browser-css.patch | 2 +- src/browser/themes/osx/browser-css.patch | 2 +- .../themes/shared/browser-shared-css.patch | 15 +- .../identity-block/identity-block-css.patch | 2 +- src/browser/themes/shared/jar-inc-mn.patch | 4 +- .../shared/preferences/zen-preferences.css | 3 +- .../shared/tabbrowser/content-area-css.patch | 8 +- .../themes/shared/tabbrowser/tabs-css.patch | 38 +-- .../themes/shared/toolbarbuttons-css.patch | 26 +- .../themes/shared/urlbar-searchbar-css.patch | 10 +- .../themes/shared/urlbar-variables-css.patch | 13 + .../themes/shared/urlbarView-css.patch | 6 +- src/docshell/base/nsAboutRedirector-cpp.patch | 2 +- src/dom/base/Document-cpp.patch | 6 +- .../mediacontrol/MediaController-cpp.patch | 2 +- .../mediaelement/HTMLMediaElement-cpp.patch | 4 +- src/eslint-file-globals-config-mjs.patch | 4 +- ..._urlbar_closeonwindowblur_preference.patch | 2 +- .../firefox/native_macos_popovers.patch | 130 +++---- src/external-patches/manifest.json | 8 +- src/gfx/wr/webrender/src/picture-rs.patch | 18 - src/image/decoders/nsJXLDecoder-cpp.patch | 318 ------------------ src/image/decoders/nsJXLDecoder-h.patch | 23 -- .../libpref/init/StaticPrefList-yaml.patch | 4 +- .../style/gecko/media_features-rs.patch | 2 +- src/testing/mochitest/browser-test-js.patch | 6 +- .../rust/mime_guess/src/mime_types-rs.patch | 31 -- .../PictureInPictureChild-sys-mjs.patch | 2 +- .../downloads/DownloadList-sys-mjs.patch | 12 - .../extensions/parent/ext-downloads-js.patch | 20 -- .../extensions/parent/ext-tabs-base-js.patch | 14 +- .../content/filepicker-properties.patch | 13 - .../widgets/browser-custom-element-mjs.patch | 4 +- src/toolkit/content/widgets/tabbox-js.patch | 12 +- src/toolkit/content/xul-css.patch | 2 +- .../unknownContentType-properties.patch | 12 - .../modules/AppConstants-sys-mjs.patch | 4 +- .../LightweightThemeConsumer-sys-mjs.patch | 4 +- src/toolkit/modules/moz-build.patch | 4 +- .../extensions/AddonManager-sys-mjs.patch | 4 +- .../extensions/content/aboutaddons-css.patch | 4 +- .../profile/nsToolkitProfileService-cpp.patch | 6 +- .../dist/tokens-shared-css.patch | 2 +- .../shared/in-content/common-shared-css.patch | 24 +- src/toolkit/themes/shared/menulist-css.patch | 2 +- src/toolkit/themes/shared/popup-css.patch | 6 +- src/toolkit/xre/nsXREDirProvider-cpp.patch | 8 +- .../signing/macos/mach_commands-py.patch | 4 +- src/widget/cocoa/nsDragService-mm.patch | 6 +- src/widget/gtk/nsAppShell-cpp.patch | 14 - src/xpfe/appshell/AppWindow-cpp.patch | 2 +- src/zen/common/ZenPreloadedScripts.js | 1 + src/zen/common/modules/ZenUIManager.mjs | 3 +- src/zen/common/styles/zen-omnibox.css | 2 +- .../common/styles/zen-single-components.css | 3 +- src/zen/drag-and-drop/nsZenDragAndDrop.h | 4 +- src/zen/folders/ZenFolders.mjs | 4 +- src/zen/mods/ZenStyleSheetCache.h | 4 +- src/zen/mods/nsZenModsBackend.h | 4 +- src/zen/split-view/ZenViewSplitter.mjs | 2 +- src/zen/tabs/ZenPinnedTabManager.mjs | 2 +- .../sandbox/browser_xdg_default.toml | 5 +- .../sandbox/browser_xdg_mozLegacyHome.toml | 5 +- .../shell/unit/test_writeShortcutIcon.js | 72 ++++ .../tests/mochitests/shell/unit/xpcshell.toml | 9 + src/zen/toolkit/common/ZenCommonUtils.h | 4 +- src/zen/toolkit/common/ZenShareInternal.h | 4 +- src/zen/urlbar/ZenUBProvider.sys.mjs | 7 +- src/zen/welcome/ZenWelcome.mjs | 19 +- surfer.json | 2 +- 144 files changed, 828 insertions(+), 1302 deletions(-) delete mode 100644 src/Cargo-lock.patch delete mode 100644 src/Cargo-toml.patch create mode 100644 src/browser/components/aiwindow/ui/modules/AIWindow-sys-mjs.patch delete mode 100644 src/browser/installer/windows/msix/AppxManifest-xml-in.patch delete mode 100644 src/browser/installer/windows/nsis/shared-nsh.patch create mode 100644 src/browser/themes/shared/urlbar-variables-css.patch delete mode 100644 src/gfx/wr/webrender/src/picture-rs.patch delete mode 100644 src/image/decoders/nsJXLDecoder-cpp.patch delete mode 100644 src/image/decoders/nsJXLDecoder-h.patch delete mode 100644 src/third_party/rust/mime_guess/src/mime_types-rs.patch delete mode 100644 src/toolkit/components/downloads/DownloadList-sys-mjs.patch delete mode 100644 src/toolkit/components/extensions/parent/ext-downloads-js.patch delete mode 100644 src/toolkit/content/filepicker-properties.patch delete mode 100644 src/toolkit/locales/en-US/chrome/mozapps/downloads/unknownContentType-properties.patch delete mode 100644 src/widget/gtk/nsAppShell-cpp.patch create mode 100644 src/zen/tests/mochitests/shell/unit/test_writeShortcutIcon.js diff --git a/README.md b/README.md index 8482e4ec2..39b0bd086 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 `148.0.2`! 🚀 -- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 148.0.2`! +- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 149.0`! ### Contributing diff --git a/build/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash index 7057faa04..d845bf6e1 100644 --- a/build/firefox-cache/l10n-last-commit-hash +++ b/build/firefox-cache/l10n-last-commit-hash @@ -1 +1 @@ -7b8f3620beb1de157d972de32f9f34320f0ae189 \ No newline at end of file +c10d7dc50d4b596942cce48f8b023b831a27480a \ No newline at end of file diff --git a/prefs/firefox/browser.yaml b/prefs/firefox/browser.yaml index 1570f2eba..e477ec087 100644 --- a/prefs/firefox/browser.yaml +++ b/prefs/firefox/browser.yaml @@ -79,3 +79,6 @@ - name: browser.tabs.dragDrop.moveOverThresholdPercent value: 50 # Percentage of tab height to trigger move over on drag-and-drop + +- name: browser.settings-redesign.enabled + value: true diff --git a/prefs/firefox/urlbar.yaml b/prefs/firefox/urlbar.yaml index df3ae8b60..804198654 100644 --- a/prefs/firefox/urlbar.yaml +++ b/prefs/firefox/urlbar.yaml @@ -61,3 +61,6 @@ # We've submitted a patch to Firefox at https://bugzilla.mozilla.org/show_bug.cgi?id=2018499 - name: browser.urlbar.closeOnWindowBlur value: false + +- name: browser.urlbar.trustPanel.featureGate + value: false diff --git a/prefs/zen/zen.yaml b/prefs/zen/zen.yaml index d83477751..fd0dbd67f 100644 --- a/prefs/zen/zen.yaml +++ b/prefs/zen/zen.yaml @@ -23,9 +23,6 @@ - name: zen.tabs.select-recently-used-on-close value: true -- name: zen.tabs.use-legacy-drag-and-drop - value: false - - name: zen.tabs.folder-dragover-threshold-percent value: 20 # Percentage of folder height to trigger dragover diff --git a/src/-prettierignore.patch b/src/-prettierignore.patch index edcc3a185..a1963c31b 100644 --- a/src/-prettierignore.patch +++ b/src/-prettierignore.patch @@ -1,8 +1,8 @@ diff --git a/.prettierignore b/.prettierignore -index cbca8bb4b36cecc44e6b498e9ef15bc4bdc21871..8f3a14e14a2d58875bdd6f04bd31f57e23073148 100644 +index 3e562d74d744bb703c9ebb8ea2df496feb40f48a..3285ee51c32029ce80e8b22616389bc776345da4 100644 --- a/.prettierignore +++ b/.prettierignore -@@ -1795,3 +1795,12 @@ tools/ts/test/baselines/ +@@ -1804,3 +1804,12 @@ tools/ts/test/baselines/ try_task_config.json xpcom/idl-parser/xpidl/fixtures/xpctest.d.json **/package-lock.json diff --git a/src/-stylelintrc-js.patch b/src/-stylelintrc-js.patch index 9e3900231..2454e3824 100644 --- a/src/-stylelintrc-js.patch +++ b/src/-stylelintrc-js.patch @@ -1,5 +1,5 @@ diff --git a/.stylelintrc.js b/.stylelintrc.js -index 36719c9e152c34da2aa76fc74d74e58cb9e6b1cc..4226db2e0af4b36923a93dcd0b76e59f8508ba36 100644 +index 3c9fecf731126fdbf900d1bdcd3635dd31ed53ef..c3a210b8153e9699c6cbdc0d568bb72433976b2c 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -67,7 +67,7 @@ module.exports = { @@ -11,15 +11,12 @@ index 36719c9e152c34da2aa76fc74d74e58cb9e6b1cc..4226db2e0af4b36923a93dcd0b76e59f { ignore: ["blockless-at-rules"], }, -@@ -274,9 +274,9 @@ module.exports = { +@@ -274,7 +274,7 @@ module.exports = { // Remove this line setting `csscontrols/use-logical` to null after implementing fixes "csstools/use-logical": null, "stylelint-plugin-mozilla/no-base-design-tokens": true, - "stylelint-plugin-mozilla/use-design-tokens": true, + "stylelint-plugin-mozilla/use-design-tokens": false, - "stylelint-plugin-mozilla/no-non-semantic-token-usage": true, -- "stylelint-plugin-mozilla/use-size-tokens": true, -+ "stylelint-plugin-mozilla/use-size-tokens": false, }, overrides: [ diff --git a/src/Cargo-lock.patch b/src/Cargo-lock.patch deleted file mode 100644 index 8b955b8f7..000000000 --- a/src/Cargo-lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index abc04e6a8e1e68fa71c6de0375f8e953e6369d8b..7bdfb41e255fc12065de064162e9bf9e15d7ff12 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -4214,8 +4214,6 @@ dependencies = [ - [[package]] - name = "mime_guess" - version = "2.0.4" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" - dependencies = [ - "mime", - "unicase", diff --git a/src/Cargo-toml.patch b/src/Cargo-toml.patch deleted file mode 100644 index 33daab5bf..000000000 --- a/src/Cargo-toml.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.toml b/Cargo.toml -index ab9eda43302a6281e59a2738170e77bb0f0b1b90..3389f1c744b56e3a6a4eb3f05b0601bed4538fa1 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -240,6 +240,8 @@ moz_asserts = { path = "mozglue/static/rust/moz_asserts" } - # Workaround for https://github.com/rust-lang/cargo/issues/11232 - rure = { path = "third_party/rust/rure" } - -+mime_guess = { path = "third_party/rust/mime_guess" } -+ - # To-be-published changes. - unicode-bidi = { git = "https://github.com/servo/unicode-bidi", rev = "ca612daf1c08c53abe07327cb3e6ef6e0a760f0c" } - nss-gk-api = { git = "https://github.com/beurdouche/nss-gk-api", rev = "e48a946811ffd64abc78de3ee284957d8d1c0d63" } diff --git a/src/browser/actors/WebRTCParent-sys-mjs.patch b/src/browser/actors/WebRTCParent-sys-mjs.patch index dca293e17..736cb9905 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 ffa7d61ded4f2cf5866d0cb12dd9b14728a63570..5575943208a734f820758fd50a80503061934d56 100644 +index e8b762b4c8f71ddafc090415abfe97674401dbc2..5dda5fe9c9bc02ebe7713f7bd21315fe4ba8b8cd 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/base/content/browser-addons-js.patch b/src/browser/base/content/browser-addons-js.patch index 0ffa166ff..ba8db225e 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 cfb6b8dd5443966d0635c3d7b477a68eca8fa9e0..c876890706b1a314c7760bbe1ff5e9eb57857e60 100644 +index 737ccf0feff4910426f7f75a20ac20ec480461dc..177ab12f9478e1ce664b7b2c66b0e2c8bca63573 100644 --- a/browser/base/content/browser-addons.js +++ b/browser/base/content/browser-addons.js -@@ -1069,7 +1069,7 @@ var gXPInstallObserver = { +@@ -1061,7 +1061,7 @@ var gXPInstallObserver = { persistent: true, hideClose: true, popupOptions: { @@ -11,7 +11,7 @@ index cfb6b8dd5443966d0635c3d7b477a68eca8fa9e0..c876890706b1a314c7760bbe1ff5e9eb }, }; -@@ -1279,7 +1279,7 @@ var gXPInstallObserver = { +@@ -1283,7 +1283,7 @@ var gXPInstallObserver = { hideClose: true, timeout: Date.now() + 30000, popupOptions: { @@ -20,7 +20,7 @@ index cfb6b8dd5443966d0635c3d7b477a68eca8fa9e0..c876890706b1a314c7760bbe1ff5e9eb }, }; -@@ -2212,7 +2212,7 @@ var gUnifiedExtensions = { +@@ -2210,7 +2210,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 cfb6b8dd5443966d0635c3d7b477a68eca8fa9e0..c876890706b1a314c7760bbe1ff5e9eb const attr = anchorID + "popupnotificationanchor"; if (!aBrowser[attr]) { -@@ -2223,7 +2223,7 @@ var gUnifiedExtensions = { +@@ -2221,7 +2221,7 @@ var gUnifiedExtensions = { anchorID // Anchor on the toolbar icon to position the popup right below the // button. @@ -38,7 +38,7 @@ index cfb6b8dd5443966d0635c3d7b477a68eca8fa9e0..c876890706b1a314c7760bbe1ff5e9eb } return anchorID; -@@ -2548,7 +2548,7 @@ var gUnifiedExtensions = { +@@ -2546,7 +2546,7 @@ var gUnifiedExtensions = { requestAnimationFrame(() => this.updateAttention()); }, @@ -47,7 +47,7 @@ index cfb6b8dd5443966d0635c3d7b477a68eca8fa9e0..c876890706b1a314c7760bbe1ff5e9eb // A list of extension widget IDs (possibly empty). let widgetIDs; -@@ -2562,7 +2562,7 @@ var gUnifiedExtensions = { +@@ -2560,7 +2560,7 @@ var gUnifiedExtensions = { } // The list of overflowed extensions in the extensions panel. @@ -56,7 +56,7 @@ index cfb6b8dd5443966d0635c3d7b477a68eca8fa9e0..c876890706b1a314c7760bbe1ff5e9eb "#overflowed-extensions-list" ); -@@ -2663,37 +2663,41 @@ var gUnifiedExtensions = { +@@ -2661,37 +2661,41 @@ var gUnifiedExtensions = { ); template.replaceWith(template.content); this._panel = document.getElementById("unified-extensions-panel"); @@ -123,7 +123,7 @@ index cfb6b8dd5443966d0635c3d7b477a68eca8fa9e0..c876890706b1a314c7760bbe1ff5e9eb if (!CustomizationHandler.isCustomizing()) { if (aEvent) { if ( -@@ -2715,6 +2719,7 @@ var gUnifiedExtensions = { +@@ -2713,6 +2717,7 @@ var gUnifiedExtensions = { // and no alternative content is available for display in the panel. const policies = this.getActivePolicies(); if ( @@ -131,7 +131,7 @@ index cfb6b8dd5443966d0635c3d7b477a68eca8fa9e0..c876890706b1a314c7760bbe1ff5e9eb policies.length && !this.hasExtensionsInPanel(policies) && !this.isPrivateWindowMissingExtensionsWithoutPBMAccess() && -@@ -2730,32 +2735,30 @@ var gUnifiedExtensions = { +@@ -2728,32 +2733,30 @@ var gUnifiedExtensions = { this.blocklistAttentionInfo = await AddonManager.getBlocklistAttentionInfo(); @@ -170,7 +170,7 @@ index cfb6b8dd5443966d0635c3d7b477a68eca8fa9e0..c876890706b1a314c7760bbe1ff5e9eb triggerEvent: aEvent, }); } -@@ -2942,18 +2945,20 @@ var gUnifiedExtensions = { +@@ -2948,18 +2951,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 1c8e4e1fb..fa9a0af70 100644 --- a/src/browser/base/content/browser-commands-js.patch +++ b/src/browser/base/content/browser-commands-js.patch @@ -1,5 +1,5 @@ diff --git a/browser/base/content/browser-commands.js b/browser/base/content/browser-commands.js -index 939ca497b882b3f4200141ba1b6764fb5c846f45..09eb945215bb26e18c4414850bc4233ad5bd760c 100644 +index 75ddd82c18979571f377dec94fe1883f1349cc16..58ae4d88f7f0b37187cb61fcaf4cf84a9af7991f 100644 --- a/browser/base/content/browser-commands.js +++ b/browser/base/content/browser-commands.js @@ -14,6 +14,10 @@ var BrowserCommands = { diff --git a/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch b/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch index 26368038d..60692a527 100644 --- a/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch +++ b/src/browser/base/content/browser-fullScreenAndPointerLock-js.patch @@ -1,13 +1,13 @@ diff --git a/browser/base/content/browser-fullScreenAndPointerLock.js b/browser/base/content/browser-fullScreenAndPointerLock.js -index 0e1aa344c084abdce40058278b12a042a4510997..50c06aaab823cb8572eee2ad53a7b709b1cfd084 100644 +index 38b4267c737ba247068e1001c12f1cb93cd248f7..f0d7002246645de48dd3ed24a84122d0bcc95b5a 100644 --- a/browser/base/content/browser-fullScreenAndPointerLock.js +++ b/browser/base/content/browser-fullScreenAndPointerLock.js -@@ -425,8 +425,6 @@ var FullScreen = { +@@ -461,8 +461,6 @@ var FullScreen = { gNavToolbox.classList.toggle("fullscreen-with-menubar", shiftSize > 0); let transform = shiftSize > 0 ? `translateY(${shiftSize}px)` : ""; - gNavToolbox.style.transform = transform; - gURLBar.style.transform = gURLBar.hasAttribute("breakout") ? transform : ""; - if (shiftSize > 0) { - // If the mouse tracking missed our fullScreenToggler, then the toolbox - // might not have been shown before the menubar is animated down. Make + let searchbar = document.getElementById("searchbar-new"); + if (searchbar) { + searchbar.style.transform = searchbar.hasAttribute("breakout") diff --git a/src/browser/base/content/browser-init-js.patch b/src/browser/base/content/browser-init-js.patch index 7f346758d..e5b1bb945 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 0186e3a6508fc8e40f93619d8b3e5a0c003cbd4a..1f4fa115e591cfbe3e23d4ce880be66277a50a26 100644 +index dba83914d1131616ead67f48949bda74105b7d46..86294fe79cd30b2a24b20738c9cd1f5114e8e669 100644 --- a/browser/base/content/browser-init.js +++ b/browser/base/content/browser-init.js -@@ -243,6 +243,7 @@ var gBrowserInit = { +@@ -247,6 +247,7 @@ var gBrowserInit = { }, onLoad() { @@ -10,7 +10,7 @@ index 0186e3a6508fc8e40f93619d8b3e5a0c003cbd4a..1f4fa115e591cfbe3e23d4ce880be662 gBrowser.addEventListener("DOMUpdateBlockedPopups", e => PopupAndRedirectBlockerObserver.handleEvent(e) ); -@@ -433,6 +434,7 @@ var gBrowserInit = { +@@ -444,6 +445,7 @@ var gBrowserInit = { this._handleURIToLoad(); diff --git a/src/browser/base/content/browser-js.patch b/src/browser/base/content/browser-js.patch index b9dd6c2d9..15dfe2198 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 e2e0526a0ddd617291f1f6c17bcfb807954b481f..1373fe072b3c74a52413859d4ad3612cbe1a2bda 100644 +index 0ea3d82b88819c41ffd866ae9533ebb5a7bff957..37db181d7e71fb6250df5bae363e9cf984b44f79 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -33,6 +33,7 @@ ChromeUtils.defineESModuleGetters(this, { @@ -24,7 +24,7 @@ index e2e0526a0ddd617291f1f6c17bcfb807954b481f..1373fe072b3c74a52413859d4ad3612c if (backDisabled) { backCommand.removeAttribute("disabled"); } else { -@@ -2301,6 +2307,8 @@ var XULBrowserWindow = { +@@ -2305,6 +2311,8 @@ var XULBrowserWindow = { AboutReaderParent.updateReaderButton(gBrowser.selectedBrowser); TranslationsParent.onLocationChange(gBrowser.selectedBrowser); @@ -33,7 +33,7 @@ index e2e0526a0ddd617291f1f6c17bcfb807954b481f..1373fe072b3c74a52413859d4ad3612c PictureInPicture.updateUrlbarToggle(gBrowser.selectedBrowser); if (!gMultiProcessBrowser) { -@@ -3821,7 +3829,7 @@ function warnAboutClosingWindow() { +@@ -3820,7 +3828,7 @@ function warnAboutClosingWindow() { if (!isPBWindow && !toolbar.visible) { return gBrowser.warnAboutClosingTabs( @@ -42,7 +42,7 @@ index e2e0526a0ddd617291f1f6c17bcfb807954b481f..1373fe072b3c74a52413859d4ad3612c gBrowser.closingTabsEnum.ALL ); } -@@ -3861,7 +3869,7 @@ function warnAboutClosingWindow() { +@@ -3860,7 +3868,7 @@ function warnAboutClosingWindow() { return ( isPBWindow || gBrowser.warnAboutClosingTabs( @@ -51,7 +51,7 @@ index e2e0526a0ddd617291f1f6c17bcfb807954b481f..1373fe072b3c74a52413859d4ad3612c gBrowser.closingTabsEnum.ALL ) ); -@@ -3886,7 +3894,7 @@ function warnAboutClosingWindow() { +@@ -3885,7 +3893,7 @@ function warnAboutClosingWindow() { AppConstants.platform != "macosx" || isPBWindow || gBrowser.warnAboutClosingTabs( @@ -60,9 +60,9 @@ index e2e0526a0ddd617291f1f6c17bcfb807954b481f..1373fe072b3c74a52413859d4ad3612c gBrowser.closingTabsEnum.ALL ) ); -@@ -4809,6 +4817,9 @@ var ConfirmationHint = { - MozXULElement.insertFTLIfNeeded("toolkit/branding/brandings.ftl"); - MozXULElement.insertFTLIfNeeded("browser/confirmationHints.ftl"); +@@ -4825,6 +4833,9 @@ var ConfirmationHint = { + } + document.l10n.setAttributes(this._message, messageId, options.l10nArgs); + if (window.gZenUIManager?.showToast) { + return window.gZenUIManager.showToast(messageId, options); diff --git a/src/browser/base/content/browser-places-js.patch b/src/browser/base/content/browser-places-js.patch index d458d84a6..15472a9f3 100644 --- a/src/browser/base/content/browser-places-js.patch +++ b/src/browser/base/content/browser-places-js.patch @@ -1,8 +1,8 @@ diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js -index 925d74575827340960706718a29426bdf079b47c..921feb0e4229706b4691a43c9fc1005cbfd90999 100644 +index 543630b89bc4f1d40eda7e4e7ae68a3c9f45e1e7..fac68af45985ad2feeb1daebd470d028b49d1dde 100644 --- a/browser/base/content/browser-places.js +++ b/browser/base/content/browser-places.js -@@ -249,6 +249,8 @@ var StarUI = { +@@ -261,6 +261,8 @@ var StarUI = { }); } @@ -11,7 +11,7 @@ index 925d74575827340960706718a29426bdf079b47c..921feb0e4229706b4691a43c9fc1005c let onPanelReady = fn => { let target = this.panel; if (target.parentNode) { -@@ -300,6 +302,21 @@ var StarUI = { +@@ -312,6 +314,21 @@ var StarUI = { } }, @@ -33,7 +33,7 @@ index 925d74575827340960706718a29426bdf079b47c..921feb0e4229706b4691a43c9fc1005c removeBookmarkButtonCommand: function SU_removeBookmarkButtonCommand() { this._removeBookmarksOnPopupHidden = true; this.panel.hidePopup(); -@@ -1806,6 +1823,7 @@ var BookmarkingUI = { +@@ -1811,6 +1828,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.patch b/src/browser/base/content/browser-sets-inc.patch index 3abbb9f94..bc6e0e638 100644 --- a/src/browser/base/content/browser-sets-inc.patch +++ b/src/browser/base/content/browser-sets-inc.patch @@ -1,8 +1,8 @@ diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc -index df768aaa77a6986260da5052ed14c8403d48de6b..a30e3a2784a6215c959d23802b5c2c966f89ca10 100644 +index 8871fc984acccfd9c54c7aef9f91934d81ba00c0..923ab3bda423eae77518f437221c32ca4990f5ce 100644 --- a/browser/base/content/browser-sets.inc +++ b/browser/base/content/browser-sets.inc -@@ -414,3 +414,4 @@ +@@ -415,3 +415,4 @@ internal="true"/> #endif diff --git a/src/browser/base/content/browser-sets-js.patch b/src/browser/base/content/browser-sets-js.patch index 84709df03..14f373418 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 50845ebd925955bf9646fc499b9828eccbf266ef..5482a24576ebcd4382409cae01a4c6bcbd88a96c 100644 +index 2918f0c46f404cba1658d4da823c6ca41cba8ded..2cb8e8c1c9dd1059bee45911159bf392f3a86ee9 100644 --- a/browser/base/content/browser-sets.js +++ b/browser/base/content/browser-sets.js -@@ -270,7 +270,7 @@ document.addEventListener( +@@ -272,7 +272,7 @@ document.addEventListener( } }); @@ -11,7 +11,7 @@ index 50845ebd925955bf9646fc499b9828eccbf266ef..5482a24576ebcd4382409cae01a4c6bc const SIDEBAR_REVAMP_PREF = "sidebar.revamp"; const SIDEBAR_REVAMP_ENABLED = Services.prefs.getBoolPref( SIDEBAR_REVAMP_PREF, -@@ -308,6 +308,8 @@ document.addEventListener( +@@ -310,6 +310,8 @@ document.addEventListener( panel: SidebarController.currentID, opened: SidebarController._state.launcherExpanded, }); diff --git a/src/browser/base/content/browser-siteIdentity-js.patch b/src/browser/base/content/browser-siteIdentity-js.patch index ca9cb89b0..cae64fb0e 100644 --- a/src/browser/base/content/browser-siteIdentity-js.patch +++ b/src/browser/base/content/browser-siteIdentity-js.patch @@ -1,5 +1,5 @@ diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js -index 6d2052e060896bb5e91ba84c15bf14c969340935..6ceef1806e2d88cd7e2ebc867d633e9148f3b298 100644 +index cff28e1cdb550357662e8a7a41856e80b1de0018..9d569c1a1e6249c58a1e30fbb224c316c52ef204 100644 --- a/browser/base/content/browser-siteIdentity.js +++ b/browser/base/content/browser-siteIdentity.js @@ -464,11 +464,6 @@ var gIdentityHandler = { @@ -14,7 +14,7 @@ index 6d2052e060896bb5e91ba84c15bf14c969340935..6ceef1806e2d88cd7e2ebc867d633e91 let baseDomain = SiteDataManager.getBaseDomainFromHost(this._uri.host); if (SiteDataManager.promptSiteDataRemoval(window, [baseDomain])) { -@@ -847,7 +842,7 @@ var gIdentityHandler = { +@@ -853,7 +848,7 @@ var gIdentityHandler = { // This is a secure internal Firefox page. this._identityBox.className = "chromeUI"; let brandBundle = document.getElementById("bundle_brand"); @@ -23,7 +23,7 @@ index 6d2052e060896bb5e91ba84c15bf14c969340935..6ceef1806e2d88cd7e2ebc867d633e91 } else if (this._pageExtensionPolicy) { // This is a WebExtension page. this._identityBox.className = "extensionPage"; -@@ -1190,6 +1185,12 @@ var gIdentityHandler = { +@@ -1196,6 +1191,12 @@ var gIdentityHandler = { } } diff --git a/src/browser/base/content/browser-xhtml.patch b/src/browser/base/content/browser-xhtml.patch index 548bf7cc6..364f2198f 100644 --- a/src/browser/base/content/browser-xhtml.patch +++ b/src/browser/base/content/browser-xhtml.patch @@ -1,5 +1,5 @@ diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml -index 832d98f911e0bd0e231421332a521bfefea72ef8..a9955256c81b252fe0527ae5857c9283e2518274 100644 +index a95ce8f0b28d98632c06f605b510b5ae3e98c4ed..275b3f5f30046a5e08d9ebceff0d2b91c865eb1b 100644 --- a/browser/base/content/browser.xhtml +++ b/browser/base/content/browser.xhtml @@ -19,6 +19,7 @@ diff --git a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch index 25e327eca..d75f5a2c9 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 4d4223c508560136aba220adb18528aac913a188..10d4d9cecbb0e7cec9191d78fb81a57376b37ff1 100644 +index 3f7b85086de11923f9453c8f02afb517c49afa8b..5be31a0cb3c5a52ba90cd2cd7f333a0354d9f2af 100644 --- a/browser/base/content/navigator-toolbox.inc.xhtml +++ b/browser/base/content/navigator-toolbox.inc.xhtml @@ -2,7 +2,7 @@ diff --git a/src/browser/base/content/navigator-toolbox-js.patch b/src/browser/base/content/navigator-toolbox-js.patch index 15afc4341..b1d06369c 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 15469e9d9b91c1eaef2578c9e43b6999edac3392..95ae5036b57baeb5237603c0921f1e9252af6919 100644 +index 362a85c20d8f0633fa78f85578e4cf015fdd0e44..ef7d6ff9e0e9876bc1918e365fd0addcd177cecb 100644 --- a/browser/base/content/navigator-toolbox.js +++ b/browser/base/content/navigator-toolbox.js -@@ -6,7 +6,7 @@ +@@ -11,7 +11,7 @@ ChromeUtils.defineESModuleGetters(this, { document.addEventListener( "DOMContentLoaded", () => { @@ -11,7 +11,7 @@ index 15469e9d9b91c1eaef2578c9e43b6999edac3392..95ae5036b57baeb5237603c0921f1e92 const widgetOverflow = document.getElementById("widget-overflow"); function onPopupShowing(event) { -@@ -184,6 +184,7 @@ document.addEventListener( +@@ -189,6 +189,7 @@ document.addEventListener( #forward-button, #reload-button , #reader-mode-button, @@ -19,7 +19,7 @@ index 15469e9d9b91c1eaef2578c9e43b6999edac3392..95ae5036b57baeb5237603c0921f1e92 #picture-in-picture-button, #urlbar-zoom-button, #star-button-box, -@@ -209,6 +210,17 @@ document.addEventListener( +@@ -215,6 +216,17 @@ document.addEventListener( gBrowser.handleNewTabMiddleClick(element, event); break; @@ -37,15 +37,15 @@ index 15469e9d9b91c1eaef2578c9e43b6999edac3392..95ae5036b57baeb5237603c0921f1e92 case "back-button": case "forward-button": case "reload-button": -@@ -318,6 +330,7 @@ document.addEventListener( +@@ -330,6 +342,7 @@ document.addEventListener( #downloads-button, #fxa-toolbar-menu-button, #unified-extensions-button, + #zen-site-data-icon-button, #library-button, - #split-view-button - `); -@@ -401,6 +414,16 @@ document.addEventListener( + #split-view-button, + #smartwindow-ask-button +@@ -414,6 +427,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 9eaa02e26..c76ecb3c8 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 90c8d48fa992ca5ac125fa2998741db79264de4a..a598431671e42b9ede23b0595790564202408a8e 100644 +index a929907fcaf893c00259f56815f202ba475e1e41..9e15f5b8f8eb3fa31fd463e383794acd18314767 100644 --- a/browser/base/content/nsContextMenu.sys.mjs +++ b/browser/base/content/nsContextMenu.sys.mjs -@@ -371,6 +371,9 @@ export class nsContextMenu { +@@ -377,6 +377,9 @@ export class nsContextMenu { this.initPDFItems(); this.initTextFragmentItems(); diff --git a/src/browser/base/content/zen-preloaded.inc.xhtml b/src/browser/base/content/zen-preloaded.inc.xhtml index 3e38442e9..d7893b9e6 100644 --- a/src/browser/base/content/zen-preloaded.inc.xhtml +++ b/src/browser/base/content/zen-preloaded.inc.xhtml @@ -8,6 +8,5 @@ - \ No newline at end of file diff --git a/src/browser/base/jar-mn.patch b/src/browser/base/jar-mn.patch index a935240d2..a53fcbea0 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 b1f7121a1f3926fe3eb89540edb7dcbb68734039..61c98964cf5efd0a603500cf36559713e1f231f7 100644 +index 22550debb8bba2a06bcd34ba9a21737105be5d92..fb4832243078c78926a66693f4ebe447c692b393 100644 --- a/browser/base/jar.mn +++ b/browser/base/jar.mn -@@ -109,3 +109,5 @@ browser.jar: +@@ -108,3 +108,5 @@ browser.jar: # L10n resources and overrides. % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties diff --git a/src/browser/components/BrowserGlue-sys-mjs.patch b/src/browser/components/BrowserGlue-sys-mjs.patch index 51d378d4a..a0b40ae78 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 33a0f6b7e5cfe087388483fefa55b927e3e3f4a3..65135c6904b5e9523f77689dfc572aefe11b0961 100644 +index 938b7aa84266ad92b6654b4e44f7bca3dc315912..cb4f544e3cb9e035d17079c11420d72148db0d33 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 33a0f6b7e5cfe087388483fefa55b927e3e3f4a3..65135c6904b5e9523f77689dfc572aef AboutHomeStartupCache: "resource:///modules/AboutHomeStartupCache.sys.mjs", AWToolbarButton: "resource:///modules/aboutwelcome/AWToolbarUtils.sys.mjs", ASRouter: "resource:///modules/asrouter/ASRouter.sys.mjs", -@@ -1455,7 +1456,7 @@ BrowserGlue.prototype = { +@@ -1456,7 +1457,7 @@ BrowserGlue.prototype = { windowcount++; let tabbrowser = win.gBrowser; if (tabbrowser) { @@ -19,7 +19,7 @@ index 33a0f6b7e5cfe087388483fefa55b927e3e3f4a3..65135c6904b5e9523f77689dfc572aef } } -@@ -1620,6 +1621,8 @@ BrowserGlue.prototype = { +@@ -1621,6 +1622,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 7c57e388a..18dc4a35c 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 0e1985aa519d66b047c5d40977bb12099d966b18..76b59891b4c4464b38d6973858f13fff0285737d 100644 +index 6952ca1c306aa8815f662d8c557d4dd6b79fce0f..ce420f1b2f57e3f23ef18cac20938662f3ecf1ae 100644 --- a/browser/components/aboutwelcome/content/aboutwelcome.css +++ b/browser/components/aboutwelcome/content/aboutwelcome.css -@@ -329,6 +329,11 @@ panel#feature-callout { +@@ -331,6 +331,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 0e1985aa519d66b047c5d40977bb12099d966b18..76b59891b4c4464b38d6973858f13fff } panel#feature-callout::part(content) { -@@ -512,6 +517,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 0e1985aa519d66b047c5d40977bb12099d966b18..76b59891b4c4464b38d6973858f13fff } #feature-callout .screen[pos=callout] .section-main .main-content .main-content-inner { gap: 12px; -@@ -818,6 +829,10 @@ panel#feature-callout::part(content) { +@@ -830,6 +841,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 new file mode 100644 index 000000000..7dccc12a8 --- /dev/null +++ b/src/browser/components/aiwindow/ui/modules/AIWindow-sys-mjs.patch @@ -0,0 +1,12 @@ +diff --git a/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs b/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs +index 7338737a25c2b75f28c48f573a58b72ec326ad3b..7cf3aa1164d38bc9daaa010f27c567e0d9792bc6 100644 +--- a/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs ++++ b/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs +@@ -200,6 +200,7 @@ export const AIWindow = { + }, + + _updateWindowSwitcherPosition(win) { ++ return; + const modeSwitcherButton = win.document.getElementById("ai-window-toggle"); + + const targetToolbar = win.document.getElementById( diff --git a/src/browser/components/asrouter/modules/FeatureCallout-sys-mjs.patch b/src/browser/components/asrouter/modules/FeatureCallout-sys-mjs.patch index b949e423e..1cf76c7cd 100644 --- a/src/browser/components/asrouter/modules/FeatureCallout-sys-mjs.patch +++ b/src/browser/components/asrouter/modules/FeatureCallout-sys-mjs.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/asrouter/modules/FeatureCallout.sys.mjs b/browser/components/asrouter/modules/FeatureCallout.sys.mjs -index 80dd8b5e357acc9decea6cf621c4868d547a0eb3..8a5fea6ed1a62a5930bafffcbbde3ce3292e42a1 100644 +index a380e024e4ad6f77ad3ad74bb7a0784d7dfb6ff3..e990f8c2412f48ca5272a7741dcb7445a406462e 100644 --- a/browser/components/asrouter/modules/FeatureCallout.sys.mjs +++ b/browser/components/asrouter/modules/FeatureCallout.sys.mjs @@ -778,6 +778,7 @@ export class FeatureCallout { diff --git a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch index df0c67a67..d71574f53 100644 --- a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch +++ b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs -index 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292fa1347f4 100644 +index 4aca0aa0c90603e09b58395debb62875c018a8cf..400ad196c846083001b36d27edec6885c6bde16d 100644 --- a/browser/components/customizableui/CustomizableUI.sys.mjs +++ b/browser/components/customizableui/CustomizableUI.sys.mjs @@ -14,6 +14,7 @@ ChromeUtils.defineESModuleGetters(lazy, { @@ -10,7 +10,7 @@ index 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292 HomePage: "resource:///modules/HomePage.sys.mjs", PanelMultiView: "moz-src:///browser/components/customizableui/PanelMultiView.sys.mjs", -@@ -326,7 +327,7 @@ var CustomizableUIInternal = { +@@ -348,7 +349,7 @@ var CustomizableUIInternal = { { type: CustomizableUI.TYPE_PANEL, defaultPlacements: [], @@ -19,7 +19,7 @@ index 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292 }, false ); -@@ -336,19 +337,14 @@ var CustomizableUIInternal = { +@@ -358,20 +359,15 @@ var CustomizableUIInternal = { "back-button", "forward-button", "stop-reload-button", @@ -32,6 +32,7 @@ index 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292 "spring", - "downloads-button", AppConstants.MOZ_DEV_EDITION ? "developer-button" : null, + lazy.ippEnabled ? "ipprotection-button" : null, - "fxa-toolbar-menu-button", lazy.resetPBMToolbarButtonEnabled ? "reset-pbm-toolbar-button" : null, ].filter(name => name); @@ -40,7 +41,7 @@ index 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292 this.registerArea( CustomizableUI.AREA_NAVBAR, { -@@ -356,8 +352,6 @@ var CustomizableUIInternal = { +@@ -379,8 +375,6 @@ var CustomizableUIInternal = { overflowable: true, defaultPlacements: navbarPlacements, verticalTabsDefaultPlacements: [ @@ -49,7 +50,7 @@ index 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292 ], defaultCollapsed: false, }, -@@ -381,10 +375,7 @@ var CustomizableUIInternal = { +@@ -404,10 +398,7 @@ var CustomizableUIInternal = { { type: CustomizableUI.TYPE_TOOLBAR, defaultPlacements: [ @@ -60,7 +61,7 @@ index 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292 ], verticalTabsDefaultPlacements: [], defaultCollapsed: null, -@@ -466,6 +457,7 @@ var CustomizableUIInternal = { +@@ -489,6 +480,7 @@ var CustomizableUIInternal = { CustomizableUI.AREA_NAVBAR, CustomizableUI.AREA_BOOKMARKS, CustomizableUI.AREA_TABSTRIP, @@ -68,7 +69,7 @@ index 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292 ]); if (AppConstants.platform != "macosx") { toolbars.add(CustomizableUI.AREA_MENUBAR); -@@ -1242,6 +1234,9 @@ var CustomizableUIInternal = { +@@ -1265,6 +1257,9 @@ var CustomizableUIInternal = { placements = gPlacements.get(area); } @@ -78,16 +79,15 @@ index 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292 // For toolbars that need it, mark as dirty. let defaultPlacements = areaProperties.get("defaultPlacements"); if ( -@@ -1749,7 +1744,7 @@ var CustomizableUIInternal = { +@@ -1772,7 +1767,6 @@ var CustomizableUIInternal = { lazy.log.info( "Widget " + aWidgetId + " not found, unable to remove from " + aArea ); - continue; -+ // continue; } this.notifyDOMChange(widgetNode, null, container, true, () => { -@@ -1759,7 +1754,7 @@ var CustomizableUIInternal = { +@@ -1782,7 +1776,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 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292 } else { window.gNavToolbox.palette.appendChild(widgetNode); } -@@ -1927,16 +1922,16 @@ var CustomizableUIInternal = { +@@ -1950,16 +1944,16 @@ var CustomizableUIInternal = { elem.setAttribute("skipintoolbarset", "true"); } } @@ -116,7 +116,7 @@ index 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292 // Handle initial state of vertical tabs. if (isVerticalTabs) { // Show the vertical tabs toolbar -@@ -2178,6 +2173,10 @@ var CustomizableUIInternal = { +@@ -2201,6 +2195,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 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292 this.notifyDOMChange(aNode, aNextNode, aContainer, false, () => { this.setLocationAttributes(aNode, aAreaId); aContainer.insertBefore(aNode, aNextNode); -@@ -4533,7 +4532,7 @@ var CustomizableUIInternal = { +@@ -4554,7 +4552,7 @@ var CustomizableUIInternal = { * For all registered areas, builds those areas to reflect the current * placement state of all widgets. */ @@ -136,7 +136,7 @@ index 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292 for (let [areaId, areaNodes] of gBuildAreas) { let placements = gPlacements.get(areaId); let isFirstChangedToolbar = true; -@@ -4544,7 +4543,7 @@ var CustomizableUIInternal = { +@@ -4565,7 +4563,7 @@ var CustomizableUIInternal = { if (area.get("type") == CustomizableUI.TYPE_TOOLBAR) { let defaultCollapsed = area.get("defaultCollapsed"); let win = areaNode.ownerGlobal; @@ -145,7 +145,7 @@ index 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292 win.setToolbarVisibility( areaNode, typeof defaultCollapsed == "string" -@@ -5835,6 +5834,7 @@ export var CustomizableUI = { +@@ -5856,6 +5854,7 @@ export var CustomizableUI = { unregisterArea(aName, aDestroyPlacements) { CustomizableUIInternal.unregisterArea(aName, aDestroyPlacements); }, @@ -153,7 +153,7 @@ index 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292 /** * Add a widget to an area. * If the area to which you try to add is not known to CustomizableUI, -@@ -7798,7 +7798,9 @@ class OverflowableToolbar { +@@ -7819,7 +7818,9 @@ class OverflowableToolbar { ); if (webExtList && CustomizableUI.isWebExtensionWidget(child.id)) { @@ -163,7 +163,7 @@ index 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292 webExtList.insertBefore(child, webExtList.firstElementChild); } else { child.setAttribute("cui-anchorid", this.#defaultListButton.id); -@@ -7858,7 +7860,7 @@ class OverflowableToolbar { +@@ -7879,7 +7880,7 @@ class OverflowableToolbar { ) { continue; } @@ -172,7 +172,7 @@ index 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292 if (child != aExceptChild) { sum += getInlineSize(child); } -@@ -7882,11 +7884,11 @@ class OverflowableToolbar { +@@ -7903,11 +7904,11 @@ class OverflowableToolbar { parseFloat(style.paddingLeft) - parseFloat(style.paddingRight) - toolbarChildrenWidth; @@ -186,7 +186,7 @@ index 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292 }); lazy.log.debug( -@@ -7901,7 +7903,14 @@ class OverflowableToolbar { +@@ -7922,7 +7923,14 @@ class OverflowableToolbar { Math.max(targetWidth, targetChildrenWidth) ); totalAvailWidth = Math.ceil(totalAvailWidth); @@ -202,7 +202,7 @@ index 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292 return { isOverflowing, targetContentWidth, totalAvailWidth }; } -@@ -7962,7 +7971,11 @@ class OverflowableToolbar { +@@ -7983,7 +7991,11 @@ class OverflowableToolbar { return; } } @@ -215,7 +215,7 @@ index 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292 lazy.log.debug( `Need ${minSize} but width is ${totalAvailWidth} so bailing` ); -@@ -7995,7 +8008,7 @@ class OverflowableToolbar { +@@ -8016,7 +8028,7 @@ class OverflowableToolbar { } } if (!inserted) { @@ -224,7 +224,7 @@ index 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292 } child.removeAttribute("cui-anchorid"); child.removeAttribute("overflowedItem"); -@@ -8121,6 +8134,9 @@ class OverflowableToolbar { +@@ -8142,6 +8154,9 @@ class OverflowableToolbar { * if no such list exists. */ get #webExtList() { @@ -234,7 +234,7 @@ index 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292 if (!this.#webExtListRef) { let targetID = this.#toolbar.getAttribute("addon-webext-overflowtarget"); if (!targetID) { -@@ -8132,6 +8148,9 @@ class OverflowableToolbar { +@@ -8153,6 +8168,9 @@ class OverflowableToolbar { let win = this.#toolbar.ownerGlobal; let { panel } = win.gUnifiedExtensions; this.#webExtListRef = panel.querySelector(`#${targetID}`); @@ -244,7 +244,7 @@ index 9a98f56d83ee38e0f1aa41467b4ddf215c3d90f7..c50781a1e8fd1a71baf497ba64d85292 } return this.#webExtListRef; } -@@ -8340,7 +8359,7 @@ class OverflowableToolbar { +@@ -8361,7 +8379,7 @@ class OverflowableToolbar { break; } case "mousedown": { diff --git a/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch b/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch index 7472a3627..130d1e130 100644 --- a/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch +++ b/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/customizableui/CustomizeMode.sys.mjs b/browser/components/customizableui/CustomizeMode.sys.mjs -index 52e93e9d9d77f6e410d72bee707fccf26f728004..1142f096e1221213195453d60507ba1bd2f7aed9 100644 +index e72ff7eab14f66ff4454850930a1d7266b3acefa..1a5d9c63b8942e8c20e9f91b82b5b11647b12ecc 100644 --- a/browser/components/customizableui/CustomizeMode.sys.mjs +++ b/browser/components/customizableui/CustomizeMode.sys.mjs @@ -503,7 +503,7 @@ export class CustomizeMode { diff --git a/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch b/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch index d4ac42499..bf9fc9dbb 100644 --- a/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch +++ b/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch @@ -1,8 +1,8 @@ diff --git a/browser/components/customizableui/ToolbarContextMenu.sys.mjs b/browser/components/customizableui/ToolbarContextMenu.sys.mjs -index 5be4e8ea7867e93bda2cd3eb49d966ebd73dc786..650d0008e755583392e07f35bd8e541dff7c43c4 100644 +index d5fd707b98e4b163a624c97ff4a8f2574e0b0180..32360b11270d9dad4b83229428932e598f69e774 100644 --- a/browser/components/customizableui/ToolbarContextMenu.sys.mjs +++ b/browser/components/customizableui/ToolbarContextMenu.sys.mjs -@@ -246,10 +246,7 @@ export var ToolbarContextMenu = { +@@ -243,10 +243,7 @@ export var ToolbarContextMenu = { // Show/hide sidebar and vertical tabs menu items let sidebarRevampEnabled = Services.prefs.getBoolPref("sidebar.revamp"); let showSidebarActions = diff --git a/src/browser/components/customizableui/content/panelUI-js.patch b/src/browser/components/customizableui/content/panelUI-js.patch index 1e1afd09d..2f814e123 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 1c696a11d831ea25b4b01689e9b23bda8a754900..fed5576c05aeffd87022565580ce085cb81fe70c 100644 +index e21e54525d197ca5e4c1a62999f9c34c5b4eda7d..3a57749000ba3f04c0dbd034f89e1458f5fa355e 100644 --- a/browser/components/customizableui/content/panelUI.js +++ b/browser/components/customizableui/content/panelUI.js @@ -627,10 +627,12 @@ const PanelUI = { diff --git a/src/browser/components/extensions/parent/ext-browser-js.patch b/src/browser/components/extensions/parent/ext-browser-js.patch index 73708e882..1c6064321 100644 --- a/src/browser/components/extensions/parent/ext-browser-js.patch +++ b/src/browser/components/extensions/parent/ext-browser-js.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/extensions/parent/ext-browser.js b/browser/components/extensions/parent/ext-browser.js -index 2488267f4be5142bcacf984635d9e9ecdb5f02e9..03127808b3cae28850cc276fac0f1acbca85d326 100644 +index 3ce6ae3271bb0b3873118a94363a9552877559f8..9e62181986d039cc171dfe87de1d95c1f5aacd8c 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 { @@ -18,7 +18,7 @@ index 2488267f4be5142bcacf984635d9e9ecdb5f02e9..03127808b3cae28850cc276fac0f1acb this._tabs.set(nativeTab, id); if (nativeTab.linkedBrowser) { -@@ -1273,6 +1275,10 @@ class TabManager extends TabManagerBase { +@@ -1278,6 +1280,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 915d6c2fd..add96ed9b 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 7e32fc3f3c325b7317533acf5142bb912556fdbe..04bbe6bece881a05d2eadf81411bd4df2b745017 100644 +index 019aa2ef81f76ce4921e261fd4c65c11a28c4149..4848aa4d7d4ad6b11a64abff65d2637de09bd9a5 100644 --- a/browser/components/extensions/parent/ext-tabs.js +++ b/browser/components/extensions/parent/ext-tabs.js -@@ -501,6 +501,7 @@ this.tabs = class extends ExtensionAPIPersistent { +@@ -516,6 +516,7 @@ this.tabs = class extends ExtensionAPIPersistent { } let tab = tabManager.getWrapper(updatedTab); @@ -10,7 +10,7 @@ index 7e32fc3f3c325b7317533acf5142bb912556fdbe..04bbe6bece881a05d2eadf81411bd4df let changeInfo = {}; for (let prop of needed) { -@@ -855,6 +856,7 @@ this.tabs = class extends ExtensionAPIPersistent { +@@ -881,6 +882,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 884380fc2..faddca8d4 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 615efa4238a3c0084354383a128e0dd8712c720e..29e9dbe7039ba3dc1413da45908ca8418103f6e6 100644 +index 2db11dad245dccca246cc8429a7498af9f143d5f..980ec44d9e92639b249bc83f59ea3bfae40dd921 100644 --- a/browser/components/places/PlacesUIUtils.sys.mjs +++ b/browser/components/places/PlacesUIUtils.sys.mjs -@@ -60,6 +60,7 @@ class BookmarkState { +@@ -61,6 +61,7 @@ class BookmarkState { info, tags = "", keyword = "", @@ -10,7 +10,7 @@ index 615efa4238a3c0084354383a128e0dd8712c720e..29e9dbe7039ba3dc1413da45908ca841 isFolder = false, children = [], autosave = false, -@@ -84,12 +85,18 @@ class BookmarkState { +@@ -85,12 +86,18 @@ class BookmarkState { keyword, parentGuid: info.parentGuid, index, @@ -29,7 +29,7 @@ index 615efa4238a3c0084354383a128e0dd8712c720e..29e9dbe7039ba3dc1413da45908ca841 /** * Save edited title for the bookmark * -@@ -183,6 +190,14 @@ class BookmarkState { +@@ -184,6 +191,14 @@ class BookmarkState { "BookmarkState::createBookmark" ); this._guid = results?.[0]; @@ -44,7 +44,7 @@ index 615efa4238a3c0084354383a128e0dd8712c720e..29e9dbe7039ba3dc1413da45908ca841 return this._guid; } -@@ -216,6 +231,14 @@ class BookmarkState { +@@ -217,6 +232,14 @@ class BookmarkState { "BookmarkState::save::createFolder" ); this._guid = results[0]; @@ -59,7 +59,7 @@ index 615efa4238a3c0084354383a128e0dd8712c720e..29e9dbe7039ba3dc1413da45908ca841 return this._guid; } -@@ -302,11 +325,97 @@ class BookmarkState { +@@ -303,11 +326,97 @@ class BookmarkState { await lazy.PlacesTransactions.batch(transactions, "BookmarkState::save"); } @@ -157,7 +157,7 @@ index 615efa4238a3c0084354383a128e0dd8712c720e..29e9dbe7039ba3dc1413da45908ca841 /** * Append transactions to update tags by given information. * -@@ -904,7 +1013,7 @@ export var PlacesUIUtils = { +@@ -915,7 +1024,7 @@ export var PlacesUIUtils = { aNode, aWhere, aWindow, diff --git a/src/browser/components/places/content/bookmarkProperties-xhtml.patch b/src/browser/components/places/content/bookmarkProperties-xhtml.patch index 3207a4b51..e661bfa5f 100644 --- a/src/browser/components/places/content/bookmarkProperties-xhtml.patch +++ b/src/browser/components/places/content/bookmarkProperties-xhtml.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/places/content/bookmarkProperties.xhtml b/browser/components/places/content/bookmarkProperties.xhtml -index 4aad4e4fb4139aa3d81e00eefa82e26b697df973..831e42a4a55e277b5b8e81e4317a2007c5306996 100644 +index 4aad4e4fb4139aa3d81e00eefa82e26b697df973..eb4055341964edaaff53163da8fc3723b93e72f6 100644 --- a/browser/components/places/content/bookmarkProperties.xhtml +++ b/browser/components/places/content/bookmarkProperties.xhtml @@ -38,6 +38,8 @@ diff --git a/src/browser/components/places/content/browserPlacesViews-js.patch b/src/browser/components/places/content/browserPlacesViews-js.patch index b71b2f5bd..aa584f20d 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 bbfbe9c703dff25bf939369f5b99cdaa76a5ae24..c28688d488960c1de73baf4c0e69b9f8401e4226 100644 +index 384d599c58cefbf80f5a50489fc401df0c8de8a5..aa85972946c3ff7866fbea86b0372432fb02cd6f 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 bbfbe9c703dff25bf939369f5b99cdaa76a5ae24..c28688d488960c1de73baf4c0e69b9f8 } else if (PlacesUtils.containerTypes.includes(type)) { element = document.createXULElement("menu"); element.setAttribute("container", "true"); -@@ -1014,25 +1026,33 @@ class PlacesToolbar extends PlacesViewBase { +@@ -1015,25 +1027,33 @@ class PlacesToolbar extends PlacesViewBase { this._rootElt.firstChild.remove(); } @@ -82,7 +82,7 @@ index bbfbe9c703dff25bf939369f5b99cdaa76a5ae24..c28688d488960c1de73baf4c0e69b9f8 ); ++startIndex; if (elt.localName != "toolbarseparator") { -@@ -1040,15 +1060,12 @@ class PlacesToolbar extends PlacesViewBase { +@@ -1041,15 +1061,12 @@ class PlacesToolbar extends PlacesViewBase { } } if (!elt) { @@ -101,7 +101,7 @@ index bbfbe9c703dff25bf939369f5b99cdaa76a5ae24..c28688d488960c1de73baf4c0e69b9f8 }); }); -@@ -1058,7 +1075,7 @@ class PlacesToolbar extends PlacesViewBase { +@@ -1059,7 +1076,7 @@ class PlacesToolbar extends PlacesViewBase { let fragment = document.createDocumentFragment(); for (let i = startIndex; i < limit; ++i) { @@ -110,7 +110,7 @@ index bbfbe9c703dff25bf939369f5b99cdaa76a5ae24..c28688d488960c1de73baf4c0e69b9f8 } await new Promise(resolve => window.requestAnimationFrame(resolve)); if (!this._isAlive) { -@@ -1120,6 +1137,8 @@ class PlacesToolbar extends PlacesViewBase { +@@ -1122,6 +1139,8 @@ class PlacesToolbar extends PlacesViewBase { "scheme", PlacesUIUtils.guessUrlSchemeForUI(aChild.uri) ); @@ -119,7 +119,7 @@ index bbfbe9c703dff25bf939369f5b99cdaa76a5ae24..c28688d488960c1de73baf4c0e69b9f8 } } -@@ -2268,7 +2287,7 @@ this.PlacesPanelview = class PlacesPanelview extends PlacesViewBase { +@@ -2314,7 +2333,7 @@ this.PlacesPanelview = class PlacesPanelview extends PlacesViewBase { PlacesUIUtils.guessUrlSchemeForUI(placesNode.uri) ); element.setAttribute("label", PlacesUIUtils.getBestTitle(placesNode)); diff --git a/src/browser/components/places/content/editBookmark-js.patch b/src/browser/components/places/content/editBookmark-js.patch index 92392184f..7dd2e0524 100644 --- a/src/browser/components/places/content/editBookmark-js.patch +++ b/src/browser/components/places/content/editBookmark-js.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/places/content/editBookmark.js b/browser/components/places/content/editBookmark.js -index f562f19741d882d92365da531b55e2810a0e79ea..a68ce8191314845c589f3a9f14b56028e0532628 100644 +index 0fb2225d0fadd27e9e7851be77f18afe7d053c80..347203d6ea9cab3cb803f28515613229b6a454b3 100644 --- a/browser/components/places/content/editBookmark.js +++ b/browser/components/places/content/editBookmark.js @@ -387,6 +387,10 @@ var gEditItemOverlay = { @@ -21,7 +21,7 @@ index f562f19741d882d92365da531b55e2810a0e79ea..a68ce8191314845c589f3a9f14b56028 } if (this._paneInfo.bulkTagging) { -@@ -1194,6 +1199,9 @@ var gEditItemOverlay = { +@@ -1178,6 +1183,9 @@ var gEditItemOverlay = { case "editBMPanel_tagsSelectorExpander": this.toggleTagsSelector().catch(console.error); break; @@ -31,7 +31,7 @@ index f562f19741d882d92365da531b55e2810a0e79ea..a68ce8191314845c589f3a9f14b56028 } break; } -@@ -1280,6 +1288,128 @@ var gEditItemOverlay = { +@@ -1256,6 +1264,128 @@ var gEditItemOverlay = { get bookmarkState() { return this._bookmarkState; }, @@ -160,7 +160,7 @@ index f562f19741d882d92365da531b55e2810a0e79ea..a68ce8191314845c589f3a9f14b56028 }; ChromeUtils.defineLazyGetter(gEditItemOverlay, "_folderTree", () => { -@@ -1318,6 +1448,9 @@ for (let elt of [ +@@ -1294,6 +1424,9 @@ for (let elt of [ "locationField", "keywordField", "tagsField", diff --git a/src/browser/components/preferences/jar-mn.patch b/src/browser/components/preferences/jar-mn.patch index c012d4399..e34d6d44a 100644 --- a/src/browser/components/preferences/jar-mn.patch +++ b/src/browser/components/preferences/jar-mn.patch @@ -1,8 +1,8 @@ diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn -index f06aaedc681cac4dc26d8e168d47991098477424..db2e81338793f99d9f034555abb1f6ef28bb1ae9 100644 +index bd094a48b418b8ff1e28ebbe722877262868d750..47f026b74f75329406fe021402124d5307cf6e32 100644 --- a/browser/components/preferences/jar.mn +++ b/browser/components/preferences/jar.mn -@@ -46,3 +46,5 @@ browser.jar: +@@ -49,3 +49,5 @@ browser.jar: content/browser/preferences/widgets/sync-device-name.mjs (widgets/sync-device-name/sync-device-name.mjs) content/browser/preferences/widgets/sync-engines-list.mjs (widgets/sync-engine-list/sync-engines-list.mjs) content/browser/preferences/widgets/sync-engines-list.css (widgets/sync-engine-list/sync-engines-list.css) diff --git a/src/browser/components/preferences/main-inc-xhtml.patch b/src/browser/components/preferences/main-inc-xhtml.patch index 51f4997c3..5ce97c789 100644 --- a/src/browser/components/preferences/main-inc-xhtml.patch +++ b/src/browser/components/preferences/main-inc-xhtml.patch @@ -1,18 +1,8 @@ diff --git a/browser/components/preferences/main.inc.xhtml b/browser/components/preferences/main.inc.xhtml -index 171021979f4783251db7f74d52a922d4bd244f08..cdc91ac91905956a82dfa3ed229146622d1d3d80 100644 +index f23beeb5c793bc7a6cbea4512a5f2cd379ec98c7..09617b8fbbd01e87b97e323cb3f7ca055bc06778 100644 --- a/browser/components/preferences/main.inc.xhtml +++ b/browser/components/preferences/main.inc.xhtml -@@ -49,7 +49,8 @@ - -