From bffc16ba296a2260190af4767587620b7d1513bf Mon Sep 17 00:00:00 2001 From: "mr. m" Date: Wed, 11 Feb 2026 00:35:08 +0100 Subject: [PATCH] chore: Run module list through a use-moz-source migration, b=no-bug, c=common, glance, workspaces --- .../urlbar/UrlbarUtils-sys-mjs.patch | 2 +- .../newtab/lib/ActivityStream-sys-mjs.patch | 2 +- src/layout/generic/nsIFrame-cpp.patch | 4 +-- src/layout/style/nsStyleStruct-cpp.patch | 6 ++-- src/layout/style/nsStyleStruct-h.patch | 4 +-- .../libpref/init/StaticPrefList-yaml.patch | 4 +-- .../asyncshutdown/AsyncShutdown-sys-mjs.patch | 28 +++++++++++++++++++ .../modules/AppConstants-sys-mjs.patch | 4 +-- src/toolkit/modules/moz-build.patch | 2 +- src/toolkit/moz-configure.patch | 13 +++++++-- src/toolkit/xre/nsXREDirProvider-cpp.patch | 8 +++--- src/zen/common/moz.build | 2 +- src/zen/common/styles/zen-theme.css | 2 +- src/zen/glance/zen-glance.css | 2 +- src/zen/sessionstore/moz.build | 2 +- src/zen/urlbar/moz.build | 2 +- src/zen/workspaces/zen-workspaces.css | 1 - surfer.json | 4 +-- 18 files changed, 63 insertions(+), 29 deletions(-) create mode 100644 src/toolkit/components/asyncshutdown/AsyncShutdown-sys-mjs.patch diff --git a/src/browser/components/urlbar/UrlbarUtils-sys-mjs.patch b/src/browser/components/urlbar/UrlbarUtils-sys-mjs.patch index 117cab661..a8e251387 100644 --- a/src/browser/components/urlbar/UrlbarUtils-sys-mjs.patch +++ b/src/browser/components/urlbar/UrlbarUtils-sys-mjs.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/urlbar/UrlbarUtils.sys.mjs b/browser/components/urlbar/UrlbarUtils.sys.mjs -index b97fa81cef276e4bb22414b7c182e00b4bb835dc..1f489eceead0aa331ace59281cb777db5e635366 100644 +index a4ed35032c0c60f230d95f451b3f615232784cad..2c92860acb2ddc9829eef006d93431e871241c3a 100644 --- a/browser/components/urlbar/UrlbarUtils.sys.mjs +++ b/browser/components/urlbar/UrlbarUtils.sys.mjs @@ -81,6 +81,7 @@ export var UrlbarUtils = { diff --git a/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch b/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch index 8a3e3f1c9..111bceeba 100644 --- a/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch +++ b/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch @@ -1,5 +1,5 @@ diff --git a/browser/extensions/newtab/lib/ActivityStream.sys.mjs b/browser/extensions/newtab/lib/ActivityStream.sys.mjs -index ae3c01650b3023a692cd4c50e33e3c3c39770c47..27a5fb0a630b9b79566be08cd5f7c9466ca30381 100644 +index 0f73c33c3237413131a2f4d2d1f3be857e533437..d7e9fcadc7744651fbe14952589df4603e7db592 100644 --- a/browser/extensions/newtab/lib/ActivityStream.sys.mjs +++ b/browser/extensions/newtab/lib/ActivityStream.sys.mjs @@ -295,7 +295,7 @@ export const PREFS_CONFIG = new Map([ diff --git a/src/layout/generic/nsIFrame-cpp.patch b/src/layout/generic/nsIFrame-cpp.patch index 78de363d3..18e32c588 100644 --- a/src/layout/generic/nsIFrame-cpp.patch +++ b/src/layout/generic/nsIFrame-cpp.patch @@ -1,8 +1,8 @@ diff --git a/layout/generic/nsIFrame.cpp b/layout/generic/nsIFrame.cpp -index c0ca05afc1e8eb5cb7115a22c39dcf45285fdfb7..84b3fec2c7b2bc671e7004d8571dc428b8ee011d 100644 +index 2c4aca4a5984fc3201a2c643f8d26b8c4f4ef3bd..4c21cee90e5442d45cdb2bcf3f91200f0441218f 100644 --- a/layout/generic/nsIFrame.cpp +++ b/layout/generic/nsIFrame.cpp -@@ -11958,6 +11958,11 @@ gfx::Matrix nsIFrame::ComputeWidgetTransform() const { +@@ -11956,6 +11956,11 @@ gfx::Matrix nsIFrame::ComputeWidgetTransform() const { gfx::Matrix4x4 matrix = nsStyleTransformMatrix::ReadTransforms( uiReset->mMozWindowTransform, refBox, float(appUnitsPerDevPixel)); diff --git a/src/layout/style/nsStyleStruct-cpp.patch b/src/layout/style/nsStyleStruct-cpp.patch index c7ab09331..30ca5a212 100644 --- a/src/layout/style/nsStyleStruct-cpp.patch +++ b/src/layout/style/nsStyleStruct-cpp.patch @@ -1,8 +1,8 @@ diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp -index 3c84ea049b01c20c6a7e9ff717e19d1d9e86248b..ed6b15dffa571348d1c13bf31f3b2e1638151e8f 100644 +index 25357c6a506b969c5049190c29e4e411ee5f4c31..bef909ddfc28d084cf87cae3fbd050bbde21468d 100644 --- a/layout/style/nsStyleStruct.cpp +++ b/layout/style/nsStyleStruct.cpp -@@ -3217,6 +3217,9 @@ nsStyleUIReset::nsStyleUIReset() +@@ -3270,6 +3270,9 @@ nsStyleUIReset::nsStyleUIReset() mWindowShadow(StyleWindowShadow::Auto), mWindowOpacity(1.0), mMozWindowInputRegionMargin(StyleLength::Zero()), @@ -12,7 +12,7 @@ index 3c84ea049b01c20c6a7e9ff717e19d1d9e86248b..ed6b15dffa571348d1c13bf31f3b2e16 mTransitions( nsStyleAutoArray::WITH_SINGLE_INITIAL_ELEMENT), mTransitionTimingFunctionCount(1), -@@ -3261,6 +3264,7 @@ nsStyleUIReset::nsStyleUIReset(const nsStyleUIReset& aSource) +@@ -3314,6 +3317,7 @@ nsStyleUIReset::nsStyleUIReset(const nsStyleUIReset& aSource) mWindowOpacity(aSource.mWindowOpacity), mMozWindowInputRegionMargin(aSource.mMozWindowInputRegionMargin), mMozWindowTransform(aSource.mMozWindowTransform), diff --git a/src/layout/style/nsStyleStruct-h.patch b/src/layout/style/nsStyleStruct-h.patch index 53a947b9a..846aff347 100644 --- a/src/layout/style/nsStyleStruct-h.patch +++ b/src/layout/style/nsStyleStruct-h.patch @@ -1,8 +1,8 @@ diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h -index 20d0dc30020ee7fcd27f689cb6c0754224b003c5..dcca0efd2c9822937c994dffeb63d2263fbb6331 100644 +index ca11ab168761a6da23811d802a87f6c31af6cca9..cb74679626620a12d37fb1671c373ea9793ae004 100644 --- a/layout/style/nsStyleStruct.h +++ b/layout/style/nsStyleStruct.h -@@ -2080,6 +2080,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleUIReset { +@@ -2094,6 +2094,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleUIReset { // The margin of the window region that should be transparent to events. mozilla::StyleLength mMozWindowInputRegionMargin; mozilla::StyleTransform mMozWindowTransform; diff --git a/src/modules/libpref/init/StaticPrefList-yaml.patch b/src/modules/libpref/init/StaticPrefList-yaml.patch index 59c862248..0f3f0cf67 100644 --- a/src/modules/libpref/init/StaticPrefList-yaml.patch +++ b/src/modules/libpref/init/StaticPrefList-yaml.patch @@ -1,8 +1,8 @@ diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml -index cc7fd419035a972bfab1b0e7631b8856e846ce81..b4e6d699f99e7164e62ce20792919420a8e73810 100644 +index 0986e53121fdb821bca4a7c30ff707bfdf2dbad7..2a1865098a00282aa1839df245cb472cdd64fdec 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml -@@ -19738,6 +19738,7 @@ +@@ -19748,6 +19748,7 @@ mirror: always #endif diff --git a/src/toolkit/components/asyncshutdown/AsyncShutdown-sys-mjs.patch b/src/toolkit/components/asyncshutdown/AsyncShutdown-sys-mjs.patch new file mode 100644 index 000000000..336057c89 --- /dev/null +++ b/src/toolkit/components/asyncshutdown/AsyncShutdown-sys-mjs.patch @@ -0,0 +1,28 @@ +diff --git a/toolkit/components/asyncshutdown/AsyncShutdown.sys.mjs b/toolkit/components/asyncshutdown/AsyncShutdown.sys.mjs +index 2aaef80411b2cef9563c49f23d36b08222b06b03..7bd15ebb0d9d09da57a287b47beb1f0e2e17d229 100644 +--- a/toolkit/components/asyncshutdown/AsyncShutdown.sys.mjs ++++ b/toolkit/components/asyncshutdown/AsyncShutdown.sys.mjs +@@ -492,6 +492,23 @@ function getPhase(topic) { + } + return undefined; + }, ++ ++ /** ++ * Reset the phase after a call to _trigger(). ++ * For testing purposes only. ++ */ ++ get _reset() { ++ let accepted = Services.prefs.getBoolPref( ++ "toolkit.asyncshutdown.testing", ++ false ++ ); ++ if (accepted) { ++ return () => { ++ spinner = new Spinner(topic); ++ }; ++ } ++ return undefined; ++ }, + }); + gPhases.set(topic, phase); + return phase; diff --git a/src/toolkit/modules/AppConstants-sys-mjs.patch b/src/toolkit/modules/AppConstants-sys-mjs.patch index 886e98f5c..03c1b256c 100644 --- a/src/toolkit/modules/AppConstants-sys-mjs.patch +++ b/src/toolkit/modules/AppConstants-sys-mjs.patch @@ -1,8 +1,8 @@ diff --git a/toolkit/modules/AppConstants.sys.mjs b/toolkit/modules/AppConstants.sys.mjs -index 5465ed3fb01e4214029b44f338d5e1e1580c3aab..a4d6b42916014d5e0f643b35a7b4feb281f59023 100644 +index e2a22ddd6c6ba36491f37ed22bc2e1fbc149790c..920d8649ef48d685891223a834110ad9a059001a 100644 --- a/toolkit/modules/AppConstants.sys.mjs +++ b/toolkit/modules/AppConstants.sys.mjs -@@ -172,6 +172,8 @@ export var AppConstants = Object.freeze({ +@@ -170,6 +170,8 @@ export var AppConstants = Object.freeze({ MOZ_UPDATE_CHANNEL: "@MOZ_UPDATE_CHANNEL@", MOZ_WIDGET_TOOLKIT: "@MOZ_WIDGET_TOOLKIT@", diff --git a/src/toolkit/modules/moz-build.patch b/src/toolkit/modules/moz-build.patch index 256648972..ef50b730e 100644 --- a/src/toolkit/modules/moz-build.patch +++ b/src/toolkit/modules/moz-build.patch @@ -1,5 +1,5 @@ diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build -index abc630955c18de629d3ffff3e8f9aa29f57950be..97d6d5f25d0859684c405c659e0eef26007027c4 100644 +index 114a8c3e2e36e57cb2334a893a11f1619831a6e7..9c9ae37b6462d00c93d8f3319cea2960b3cd9816 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -281,6 +281,7 @@ for var in ( diff --git a/src/toolkit/moz-configure.patch b/src/toolkit/moz-configure.patch index cacaabb60..c203198ce 100644 --- a/src/toolkit/moz-configure.patch +++ b/src/toolkit/moz-configure.patch @@ -1,8 +1,8 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure -index 226d0c5a93a9a2404e1974001da4e34b7b670067..b73277448f7d2706d316df2505e17d232f392d47 100644 +index 226d0c5a93a9a2404e1974001da4e34b7b670067..4bc5f1dddd9e4a18900bb2e8e209cc4d7cf1e0fe 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure -@@ -22,6 +22,7 @@ def check_moz_app_id(moz_app_id, build_project): +@@ -22,19 +22,21 @@ def check_moz_app_id(moz_app_id, build_project): project_flag( env="MOZ_APP_VENDOR", @@ -10,7 +10,14 @@ index 226d0c5a93a9a2404e1974001da4e34b7b670067..b73277448f7d2706d316df2505e17d23 nargs=1, help='Used for application.ini\'s "Vendor" field, which also impacts profile location and user-visible fields', ) -@@ -35,6 +36,7 @@ project_flag( + + project_flag( + env="MOZ_APP_UA_NAME", +- default="", ++ default="Firefox", + nargs=1, + help="Application name in the User Agent string", + ) project_flag( "MOZ_APP_PROFILE", diff --git a/src/toolkit/xre/nsXREDirProvider-cpp.patch b/src/toolkit/xre/nsXREDirProvider-cpp.patch index edf763696..ffb1c5dc2 100644 --- a/src/toolkit/xre/nsXREDirProvider-cpp.patch +++ b/src/toolkit/xre/nsXREDirProvider-cpp.patch @@ -1,8 +1,8 @@ diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp -index 64456439499d449ce7f2861b1a5addbeecd61721..d0acdb3082b4805e2b8903f8044c97ddf29419bb 100644 +index 5eae0bca990fea9e995bd2edf5e879361f89391c..3f8bfedb83ddae07b1e82715fc7f6b2109a39e33 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp -@@ -1317,9 +1317,11 @@ nsresult nsXREDirProvider::AppendFromAppData(nsIFile* aFile, bool aIsDotted) { +@@ -1322,9 +1322,11 @@ nsresult nsXREDirProvider::AppendFromAppData(nsIFile* aFile, bool aIsDotted) { // Similar to nsXREDirProvider::AppendProfilePath. // TODO: Bug 1990407 - Evaluate if refactoring might be required there in the // future? @@ -15,7 +15,7 @@ index 64456439499d449ce7f2861b1a5addbeecd61721..d0acdb3082b4805e2b8903f8044c97dd MOZ_TRY(aFile->AppendRelativeNativePath(profile)); } else { nsAutoCString vendor; -@@ -1329,8 +1331,6 @@ nsresult nsXREDirProvider::AppendFromAppData(nsIFile* aFile, bool aIsDotted) { +@@ -1334,8 +1336,6 @@ nsresult nsXREDirProvider::AppendFromAppData(nsIFile* aFile, bool aIsDotted) { ToLowerCase(vendor); ToLowerCase(appName); @@ -24,7 +24,7 @@ index 64456439499d449ce7f2861b1a5addbeecd61721..d0acdb3082b4805e2b8903f8044c97dd MOZ_TRY(aFile->AppendRelativeNativePath(appName)); } -@@ -1498,13 +1498,8 @@ nsresult nsXREDirProvider::GetLegacyOrXDGHomePath(const char* aHomeDir, +@@ -1503,13 +1503,8 @@ nsresult nsXREDirProvider::GetLegacyOrXDGHomePath(const char* aHomeDir, // If the build was made against a specific profile name, MOZ_APP_PROFILE= // then make sure we respect this and dont move to XDG directory diff --git a/src/zen/common/moz.build b/src/zen/common/moz.build index 8dc973b44..b4855aff4 100644 --- a/src/zen/common/moz.build +++ b/src/zen/common/moz.build @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -EXTRA_JS_MODULES += [ +MOZ_SRC_FILES += [ "sys/ZenActorsManager.sys.mjs", "sys/ZenCustomizableUI.sys.mjs", "sys/ZenUIMigration.sys.mjs", diff --git a/src/zen/common/styles/zen-theme.css b/src/zen/common/styles/zen-theme.css index 88d3ff741..211fb4cf2 100644 --- a/src/zen/common/styles/zen-theme.css +++ b/src/zen/common/styles/zen-theme.css @@ -145,7 +145,7 @@ color-mix(in oklch, var(--toolbox-textcolor) 15%, transparent) ); - --zen-toolbar-element-bg-hover: light-dark(rgba(0, 0, 0, 0.1), rgba(255, 255, 255, 0.2)); + --zen-toolbar-element-bg-hover: light-dark(rgba(0, 0, 0, 0.08), rgba(255, 255, 255, 0.1)); /* Toolbar */ --tab-selected-color-scheme: inherit !important; diff --git a/src/zen/glance/zen-glance.css b/src/zen/glance/zen-glance.css index d272b815e..5a667305f 100644 --- a/src/zen/glance/zen-glance.css +++ b/src/zen/glance/zen-glance.css @@ -34,7 +34,7 @@ box-shadow: 0 0 12px 1px rgba(0, 0, 0, 0.07); padding: 8px; opacity: 1 !important; - color: var(--zen-primary-color); + color: var(--zen-primary-color) !important; &:hover { background: light-dark(rgb(41, 41, 41), rgb(204, 204, 204)); diff --git a/src/zen/sessionstore/moz.build b/src/zen/sessionstore/moz.build index 188f4c27c..941ec0bc0 100644 --- a/src/zen/sessionstore/moz.build +++ b/src/zen/sessionstore/moz.build @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -EXTRA_JS_MODULES.zen += [ +MOZ_SRC_FILES += [ "ZenSessionManager.sys.mjs", "ZenWindowSync.sys.mjs", ] diff --git a/src/zen/urlbar/moz.build b/src/zen/urlbar/moz.build index f321a86bb..abcc39ad6 100644 --- a/src/zen/urlbar/moz.build +++ b/src/zen/urlbar/moz.build @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -EXTRA_JS_MODULES += [ +MOZ_SRC_FILES += [ "ZenSiteDataPanel.sys.mjs", "ZenUBActionsProvider.sys.mjs", "ZenUBGlobalActions.sys.mjs", diff --git a/src/zen/workspaces/zen-workspaces.css b/src/zen/workspaces/zen-workspaces.css index 47fa9f7b7..f8490cf5b 100644 --- a/src/zen/workspaces/zen-workspaces.css +++ b/src/zen/workspaces/zen-workspaces.css @@ -173,7 +173,6 @@ &::before { border-radius: var(--border-radius-medium); background: transparent; - transition: background 0.1s; pointer-events: none; content: ''; position: absolute; diff --git a/surfer.json b/surfer.json index aba04bfbf..a3c93e52f 100644 --- a/surfer.json +++ b/surfer.json @@ -20,7 +20,7 @@ "brandShortName": "Zen", "brandFullName": "Zen Browser", "release": { - "displayVersion": "1.18.5b", + "displayVersion": "1.18.6b", "github": { "repo": "zen-browser/desktop" }, @@ -54,4 +54,4 @@ "licenseType": "MPL-2.0" }, "updateHostname": "updates.zen-browser.app" -} +} \ No newline at end of file