commit f8a53e9a2f08aafc12e8cc4c4d77c17f0ff0307c parent faf2b2389d5f155d992497f21fc34cac2c7aef91 Author: Lando <lando@lando.test> Date: Thu, 16 Oct 2025 09:54:33 +0000 Merge autoland to mozilla-central Diffstat:
27 files changed, 314 insertions(+), 29 deletions(-)
diff --git a/accessible/base/EventTree.cpp b/accessible/base/EventTree.cpp @@ -11,8 +11,6 @@ # include "Logging.h" #endif -#include "mozilla/UniquePtr.h" - using namespace mozilla; using namespace mozilla::a11y; diff --git a/accessible/base/EventTree.h b/accessible/base/EventTree.h @@ -11,7 +11,6 @@ #include "mozilla/a11y/DocAccessible.h" #include "mozilla/RefPtr.h" -#include "mozilla/UniquePtr.h" namespace mozilla { namespace a11y { diff --git a/accessible/windows/msaa/LazyInstantiator.cpp b/accessible/windows/msaa/LazyInstantiator.cpp @@ -12,7 +12,6 @@ #include "mozilla/a11y/Platform.h" #include "mozilla/Assertions.h" #include "mozilla/mscom/ProcessRuntime.h" -#include "mozilla/UniquePtr.h" #include "mozilla/WinHeaderOnlyUtils.h" #include "MsaaRootAccessible.h" #include "nsAccessibilityService.h" diff --git a/browser/app/winlauncher/test/TestSameBinary.cpp b/browser/app/winlauncher/test/TestSameBinary.cpp @@ -17,7 +17,6 @@ #include "mozilla/CmdLineAndEnvUtils.h" #include "mozilla/NativeNt.h" #include "mozilla/Unused.h" -#include "mozilla/Vector.h" #include "mozilla/WinHeaderOnlyUtils.h" #include "nsWindowsHelpers.h" diff --git a/browser/base/content/test/webrtc/browser.toml b/browser/base/content/test/webrtc/browser.toml @@ -57,7 +57,10 @@ https_first_disabled = true ["browser_devices_get_user_media_in_frame.js"] https_first_disabled = true -skip-if = ["debug"] # bug 1369731 +skip-if = [ + "debug", # bug 1369731 + "os == 'mac' && os_version == '15.30' && arch == 'aarch64'", # Bug 1989731 +] ["browser_devices_get_user_media_in_xorigin_frame.js"] https_first_disabled = true diff --git a/browser/components/shell/Windows11TaskbarPinning.cpp b/browser/components/shell/Windows11TaskbarPinning.cpp @@ -14,7 +14,6 @@ #include "mozilla/Result.h" #include "mozilla/ResultVariant.h" -#include "mozilla/UniquePtr.h" #include "mozilla/WinHeaderOnlyUtils.h" #include "mozilla/widget/WinTaskbar.h" #include "WinUtils.h" diff --git a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo.configure @@ -265,7 +265,9 @@ use_fat_lto = cxx_compiler.try_link( lambda extra: ["-flto", "-ffat-lto-objects"] + (extra or []) ), check_msg="whether the C++ compiler supports fat lto objects", - when=depends("--enable-lto", enable_tests)(lambda lto, tests: lto and not tests), + when=depends(select_linker, "--enable-lto", enable_tests)( + lambda linker, lto, tests: linker and linker.KIND == "lld" and lto and tests + ), ) diff --git a/devtools/startup/DevToolsShim.sys.mjs b/devtools/startup/DevToolsShim.sys.mjs @@ -52,6 +52,8 @@ export const DevToolsShim = { /** * Returns true if DevTools are enabled. This now only depends on the policy. * TODO: Merge isEnabled and isDisabledByPolicy. + * + * @returns {boolean} */ isEnabled() { return !this.isDisabledByPolicy(); @@ -60,6 +62,8 @@ export const DevToolsShim = { /** * Returns true if the devtools are completely disabled and can not be enabled. All * entry points should return without throwing, initDevTools should never be called. + * + * @returns {boolean} */ isDisabledByPolicy() { return Services.prefs.getBoolPref(DEVTOOLS_POLICY_DISABLED_PREF, false); @@ -68,7 +72,7 @@ export const DevToolsShim = { /** * Check if DevTools have already been initialized. * - * @return {Boolean} true if DevTools are initialized. + * @returns {boolean} true if DevTools are initialized. */ isInitialized() { return !!this._gDevTools; @@ -78,7 +82,7 @@ export const DevToolsShim = { * Returns the array of the existing toolboxes. This method is part of the compatibility * layer for webextensions. * - * @return {Array<Toolbox>} + * @returns {Array<Toolbox>} * An array of toolboxes. */ getToolboxes() { @@ -92,7 +96,7 @@ export const DevToolsShim = { /** * Register an instance of gDevTools. Should be called by DevTools during startup. * - * @param {DevTools} a devtools instance (from client/framework/devtools) + * @param {DevTools} gDevTools - A DevTools instance (from client/framework/devtools) */ register(gDevTools) { this._gDevTools = gDevTools; @@ -124,6 +128,9 @@ export const DevToolsShim = { * This method is used by browser/components/extensions/ext-devtools.js for the events: * - toolbox-ready * - toolbox-destroyed + * + * @param {string} event + * @param {Function} listener */ on(event, listener) { if (this.isInitialized()) { @@ -136,6 +143,9 @@ export const DevToolsShim = { /** * This method is currently only used by devtools code, but is kept here for consistency * with on(). + * + * @param {string} event + * @param {Function} listener */ off(event, listener) { if (this.isInitialized()) { @@ -148,8 +158,7 @@ export const DevToolsShim = { /** * Called from SessionStore.sys.mjs in mozilla-central when saving the current state. * - * @param {Object} state - * A SessionStore state object that gets modified by reference + * @param {object} state - A SessionStore state object that gets modified by reference */ saveDevToolsSession(state) { if (!this.isInitialized()) { @@ -162,6 +171,8 @@ export const DevToolsShim = { /** * Called from SessionStore.sys.mjs in mozilla-central when restoring a previous session. * Will always be called, even if the session does not contain DevTools related items. + * + * @param {object} session */ restoreDevToolsSession(session) { if (!this.isEnabled()) { @@ -192,7 +203,7 @@ export const DevToolsShim = { * @param {ElementIdentifier} domReference * Identifier generated by ContentDOMReference. It is a unique pair of * BrowsingContext ID and a numeric ID. - * @return {Promise} a promise that resolves when the accessible node is selected in the + * @returns {Promise} a promise that resolves when the accessible node is selected in the * accessibility inspector or that resolves immediately if DevTools are not * enabled. */ @@ -220,7 +231,7 @@ export const DevToolsShim = { * @param {ElementIdentifier} domReference * Identifier generated by ContentDOMReference. It is a unique pair of * BrowsingContext ID and a numeric ID. - * @return {Promise} a promise that resolves when the node is selected in the inspector + * @returns {Promise} a promise that resolves when the node is selected in the inspector * markup view or that resolves immediately if DevTools are not enabled. */ inspectNode(tab, domReference) { @@ -251,7 +262,7 @@ export const DevToolsShim = { * Initialize DevTools via DevToolsStartup if needed. This method throws if DevTools are * not enabled. * - * @param {String} reason + * @param {string} [reason] * optional, if provided should be a valid entry point for DEVTOOLS_ENTRY_POINT * in toolkit/components/telemetry/Histograms.json * and devtools:entry_point in devtools/client/shared/metrics.yaml diff --git a/devtools/startup/DevToolsStartup.sys.mjs b/devtools/startup/DevToolsStartup.sys.mjs @@ -18,7 +18,7 @@ * Only once any of these entry point is fired, this module ensures starting * core modules like 'devtools-browser.js' that hooks the browser windows * and ensure setting up tools. - **/ + */ const kDebuggerPrefs = [ "devtools.debugger.remote-enabled", @@ -71,6 +71,9 @@ ChromeUtils.defineLazyGetter(lazy, "KeyShortcutsBundle", function () { * * This means that language pack users might get a new Beta version but will not * have a language pack with the new strings yet. + * + * @param {string} id + * @returns {string|null} */ function getLocalizedKeyShortcut(id) { try { @@ -552,6 +555,8 @@ DevToolsStartup.prototype = { /** * Called when receiving the "browser-delayed-startup-finished" event for a new * top-level window. + * + * @param {Window} window */ onWindowReady(window) { if ( @@ -573,6 +578,12 @@ DevToolsStartup.prototype = { JsonView.initialize(); }, + /** + * Called when receiving the "browser-delayed-startup-finished" event for a top-level + * window for the first time. + * + * @param {Window} window + */ onFirstWindowReady(window) { if (this.devtoolsFlag) { this.handleDevToolsFlag(window); @@ -592,6 +603,8 @@ DevToolsStartup.prototype = { * But instead of implementing the actual actions, defer to DevTools codebase. * In most cases, it only needs to call this.initDevTools which handles the rest. * We do that to prevent loading any DevTools module until the user intent to use them. + * + * @param {Window} window */ hookWindow(window) { // Key Shortcuts need to be added on all the created windows. @@ -790,7 +803,7 @@ DevToolsStartup.prototype = { * Check if the user is a DevTools user by looking at our selfxss pref. * This preference is incremented everytime the console is used (up to 5). * - * @return {Boolean} true if the user can be considered as a devtools user. + * @returns {boolean} true if the user can be considered as a devtools user. */ isDevToolsUser() { const selfXssCount = Services.prefs.getIntPref("devtools.selfxss.count", 0); @@ -820,6 +833,10 @@ DevToolsStartup.prototype = { /** * This method attaches on the key elements to the devtools keyset. + * + * @param {Document} doc + * @param {Array<object>} keyShortcuts + * @param {XULElement} [keyset] */ attachKeys(doc, keyShortcuts, keyset = doc.getElementById("devtoolsKeyset")) { const window = doc.defaultView; @@ -837,6 +854,9 @@ DevToolsStartup.prototype = { /** * This method removes keys from the devtools keyset. + * + * @param {Document} doc + * @param {Array<object>} keyShortcuts */ removeKeys(doc, keyShortcuts) { for (const key of keyShortcuts) { @@ -850,6 +870,7 @@ DevToolsStartup.prototype = { /** * We only want to have the keyboard shortcuts active when the menu button is on. * This function either adds or removes the elements. + * * @param {boolean} isEnabled */ toggleProfilerKeyShortcuts(isEnabled) { @@ -1082,6 +1103,9 @@ DevToolsStartup.prototype = { * * --start-debugger-server ws: * Start the WebSocket server on the default port (taken from d.d.remote-port) + * + * @param {nsICommandLine} cmdLine + * @param {boolean|string} portOrPath */ handleDevToolsServerFlag(cmdLine, portOrPath) { if (!this._isRemoteDebuggingEnabled()) { @@ -1168,10 +1192,10 @@ DevToolsStartup.prototype = { * because this codepath is only used the first time a toolbox is opened for a * tab. * - * @param {String} reason + * @param {string} reason * One of "KeyShortcut", "SystemMenu", "HamburgerMenu", "ContextMenu", * "CommandLine". - * @param {String} key + * @param {string} key * The key used by a key shortcut. */ sendEntryPointTelemetry(reason, key = "") { @@ -1275,6 +1299,8 @@ DevToolsStartup.prototype = { /** * Called by setSlowScriptDebugHandler, when a tab freeze because of a slow running script + * + * @param {XULFrameElement} tab */ async slowScriptDebugHandler(tab) { const require = this.initDevTools("SlowScript"); @@ -1371,6 +1397,8 @@ const JsonView = { /** * Save JSON to a file needs to be implemented here * in the parent process. + * + * @param {object} message */ onSave(message) { const browser = message.target; diff --git a/devtools/startup/tests/browser/browser_shim_disable_devtools.js b/devtools/startup/tests/browser/browser_shim_disable_devtools.js @@ -152,6 +152,8 @@ function waitForDelayedStartupFinished(win) { /** * Helper to call the toggle devtools shortcut. + * + * @param {Window} win */ function synthesizeToggleToolboxKey(win) { info("Trigger the toogle toolbox shortcut"); diff --git a/devtools/startup/tests/xpcshell/test_devtools_shim.js b/devtools/startup/tests/xpcshell/test_devtools_shim.js @@ -40,6 +40,11 @@ function createMockDevTools() { /** * Check if a given method was called an expected number of times, and finally check the * arguments provided to the last call, if appropriate. + * + * @param {object} mock + * @param {string} method + * @param {number} length + * @param {Array} lastArgs */ function checkCalls(mock, method, length, lastArgs) { Assert.strictEqual( diff --git a/dom/base/fuzztest/FuzzStructuredClone.cpp b/dom/base/fuzztest/FuzzStructuredClone.cpp @@ -9,7 +9,6 @@ #include "jsapi.h" #include "mozilla/ErrorResult.h" #include "mozilla/ScopeExit.h" -#include "mozilla/UniquePtr.h" #include "mozilla/dom/ScriptSettings.h" #include "mozilla/dom/SimpleGlobalObject.h" #include "mozilla/dom/StructuredCloneHolder.h" diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp @@ -132,7 +132,6 @@ #include "mozilla/Tokenizer.h" #include "mozilla/UniquePtr.h" #include "mozilla/Unused.h" -#include "mozilla/Variant.h" #include "mozilla/ViewportUtils.h" #include "mozilla/dom/AncestorIterator.h" #include "mozilla/dom/AutoEntryScript.h" diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h @@ -39,7 +39,6 @@ #include "mozilla/RefPtr.h" #include "mozilla/SourceLocation.h" #include "mozilla/TimeStamp.h" -#include "mozilla/UniquePtr.h" #include "mozilla/dom/BindingDeclarations.h" #include "mozilla/dom/CacheExpirationTime.h" #include "mozilla/dom/FetchPriority.h" diff --git a/dom/base/nsGlobalWindowOuter.h b/dom/base/nsGlobalWindowOuter.h @@ -27,7 +27,6 @@ #include "mozilla/Attributes.h" #include "mozilla/EventListenerManager.h" #include "mozilla/FlushType.h" -#include "mozilla/UniquePtr.h" #include "mozilla/dom/BindingDeclarations.h" #include "mozilla/dom/BrowsingContext.h" #include "mozilla/dom/ChromeMessageBroadcaster.h" diff --git a/dom/base/nsRange.cpp b/dom/base/nsRange.cpp @@ -20,7 +20,6 @@ #include "mozilla/PresShell.h" #include "mozilla/RangeUtils.h" #include "mozilla/ToString.h" -#include "mozilla/UniquePtr.h" #include "mozilla/dom/CharacterData.h" #include "mozilla/dom/ChildIterator.h" #include "mozilla/dom/DOMRect.h" diff --git a/dom/cache/CacheStreamControlParent.cpp b/dom/cache/CacheStreamControlParent.cpp @@ -6,7 +6,6 @@ #include "mozilla/dom/cache/CacheStreamControlParent.h" -#include "mozilla/UniquePtr.h" #include "mozilla/Unused.h" #include "mozilla/dom/cache/CacheTypes.h" #include "mozilla/dom/cache/ReadStream.h" diff --git a/dom/events/Clipboard.h b/dom/events/Clipboard.h @@ -10,7 +10,6 @@ #include "mozilla/DOMEventTargetHelper.h" #include "mozilla/Logging.h" #include "mozilla/RefPtr.h" -#include "mozilla/UniquePtr.h" #include "nsString.h" #include "nsStringFwd.h" diff --git a/eslint-rollouts.config.mjs b/eslint-rollouts.config.mjs @@ -303,6 +303,7 @@ export default [ "uriloader/**", "widget/tests/window_composition_text_querycontent.xhtml", ], + ignores: ["devtools/startup/**"], rules: mozilla.turnOff(mozilla.configs["flat/valid-jsdoc"].rules), }, { @@ -467,6 +468,7 @@ export default [ "widget/tests/file*.js", "widget/tests/window_composition_text_querycontent.xhtml", ], + ignores: ["devtools/startup/**"], rules: mozilla.turnOff(mozilla.configs["flat/require-jsdoc"].rules), }, { diff --git a/intl/components/src/calendar/ICU4XChineseBasedCalendar.cpp b/intl/components/src/calendar/ICU4XChineseBasedCalendar.cpp @@ -4,6 +4,8 @@ #include "mozilla/intl/calendar/ICU4XChineseBasedCalendar.h" +#include "mozilla/Assertions.h" + namespace mozilla::intl::calendar { ICU4XChineseBasedCalendar::ICU4XChineseBasedCalendar( diff --git a/mfbt/UniquePtr.h b/mfbt/UniquePtr.h @@ -10,10 +10,8 @@ #define mozilla_UniquePtr_h #include <memory> -#include <type_traits> #include <utility> -#include "mozilla/Assertions.h" #include "mozilla/Attributes.h" namespace mozilla { diff --git a/mobile/android/fenix/app/src/main/res/values-night/colors.xml b/mobile/android/fenix/app/src/main/res/values-night/colors.xml @@ -3,6 +3,52 @@ - 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/. --> <resources xmlns:tools="http://schemas.android.com/tools"> + <!-- Material3 color variables --> + <color name="fx_mobile_primary">@color/photonViolet10</color> + <color name="fx_mobile_on_primary">@color/photonDarkGrey90</color> + <color name="fx_mobile_primary_container">@color/photonViolet80</color> + <color name="fx_mobile_on_primary_container">@color/photonLightGrey05</color> + <color name="fx_mobile_primary_inverse">@color/photonViolet70</color> + <color name="fx_mobile_secondary">@color/photonLightGrey40</color> + <color name="fx_mobile_on_secondary">@color/photonDarkGrey90</color> + <color name="fx_mobile_secondary_container">#FF4B3974</color> + <color name="fx_mobile_on_secondary_container">@color/photonLightGrey05</color> + <color name="fx_mobile_tertiary">@color/photonViolet20</color> + <color name="fx_mobile_on_tertiary">@color/photonDarkGrey90</color> + <color name="fx_mobile_tertiary_container">@color/photonPink80</color> + <color name="fx_mobile_on_tertiary_container">@color/photonLightGrey05</color> + <color name="fx_mobile_background">@color/photonDarkGrey60</color> + <color name="fx_mobile_on_background">@color/photonLightGrey05</color> + <color name="fx_mobile_surface">@color/photonDarkGrey60</color> + <color name="fx_mobile_on_surface">@color/photonLightGrey05</color> + <color name="fx_mobile_surface_variant">@color/photonDarkGrey40</color> + <color name="fx_mobile_on_surface_variant">@color/photonLightGrey40</color> + <color name="fx_mobile_surface_inverse">@color/photonLightGrey10</color> + <color name="fx_mobile_on_surface_inverse">@color/photonDarkGrey90</color> + <color name="fx_mobile_error">@color/photonRed20</color> + <color name="fx_mobile_on_error">@color/photonDarkGrey90</color> + <color name="fx_mobile_error_container">@color/photonRed80</color> + <color name="fx_mobile_on_error_container">@color/photonLightGrey05</color> + <color name="fx_mobile_outline">@color/photonLightGrey80</color> + <color name="fx_mobile_outline_variant">@color/photonDarkGrey05</color> + <color name="fx_mobile_surface_bright">@color/photonDarkGrey40</color> + <color name="fx_mobile_surface_dim">@color/photonDarkGrey80</color> + <color name="fx_mobile_surface_container">@color/photonDarkGrey60</color> + <color name="fx_mobile_surface_container_high">@color/photonDarkGrey50</color> + <color name="fx_mobile_surface_container_highest">@color/photonDarkGrey40</color> + <color name="fx_mobile_surface_container_low">@color/photonDarkGrey70</color> + <color name="fx_mobile_surface_container_lowest">@color/photonDarkGrey80</color> + <color name="fx_mobile_primary_fixed_dim">@color/photonViolet80</color> + <color name="fx_mobile_on_primary_fixed_variant">@color/photonDarkGrey90</color> + <color name="fx_mobile_secondary_fixed">#FF4B3974</color> + <color name="fx_mobile_secondary_fixed_dim">#FF4B3974</color> + <color name="fx_mobile_on_secondary_fixed">@color/photonLightGrey05</color> + <color name="fx_mobile_on_secondary_fixed_variant">@color/photonDarkGrey90</color> + <color name="fx_mobile_tertiary_fixed">@color/photonPink80</color> + <color name="fx_mobile_tertiary_fixed_dim">@color/photonPink80</color> + <color name="fx_mobile_on_tertiary_fixed">@color/photonLightGrey05</color> + <color name="fx_mobile_on_tertiary_fixed_variant">@color/photonDarkGrey90</color> + <!-- Design system color variables --> <!-- Layers --> diff --git a/mobile/android/fenix/app/src/main/res/values/colors.xml b/mobile/android/fenix/app/src/main/res/values/colors.xml @@ -3,6 +3,52 @@ - 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/. --> <resources xmlns:tools="http://schemas.android.com/tools"> + <!-- Material3 color variables --> + <color name="fx_mobile_primary">@color/photonInk20</color> + <color name="fx_mobile_on_primary">@color/photonLightGrey05</color> + <color name="fx_mobile_primary_container">@color/photonViolet05</color> + <color name="fx_mobile_on_primary_container">@color/photonDarkGrey90</color> + <color name="fx_mobile_primary_inverse">@color/photonViolet20</color> + <color name="fx_mobile_secondary">@color/photonDarkGrey05</color> + <color name="fx_mobile_on_secondary">@color/photonLightGrey05</color> + <color name="fx_mobile_secondary_container">#FFE6E0F5</color> + <color name="fx_mobile_on_secondary_container">@color/photonDarkGrey90</color> + <color name="fx_mobile_tertiary">@color/photonViolet70</color> + <color name="fx_mobile_on_tertiary">@color/photonLightGrey05</color> + <color name="fx_mobile_tertiary_container">@color/photonPink05</color> + <color name="fx_mobile_on_tertiary_container">@color/photonDarkGrey90</color> + <color name="fx_mobile_background">@color/photonLightGrey10</color> + <color name="fx_mobile_on_background">@color/photonDarkGrey90</color> + <color name="fx_mobile_surface">@color/photonLightGrey10</color> + <color name="fx_mobile_on_surface">@color/photonDarkGrey90</color> + <color name="fx_mobile_surface_variant">@color/photonLightGrey30</color> + <color name="fx_mobile_on_surface_variant">@color/photonDarkGrey05</color> + <color name="fx_mobile_surface_inverse">@color/photonDarkGrey60</color> + <color name="fx_mobile_on_surface_inverse">@color/photonLightGrey05</color> + <color name="fx_mobile_error">@color/photonRed70</color> + <color name="fx_mobile_on_error">@color/photonLightGrey05</color> + <color name="fx_mobile_error_container">@color/photonRed05</color> + <color name="fx_mobile_on_error_container">@color/photonDarkGrey90</color> + <color name="fx_mobile_outline">@color/photonLightGrey90</color> + <color name="fx_mobile_outline_variant">@color/photonLightGrey30</color> + <color name="fx_mobile_surface_bright">@color/photonWhite</color> + <color name="fx_mobile_surface_dim">@color/photonLightGrey30</color> + <color name="fx_mobile_surface_container">@color/photonLightGrey10</color> + <color name="fx_mobile_surface_container_high">@color/photonLightGrey20</color> + <color name="fx_mobile_surface_container_highest">@color/photonLightGrey30</color> + <color name="fx_mobile_surface_container_low">@color/photonLightGrey05</color> + <color name="fx_mobile_surface_container_lowest">@color/photonWhite</color> + <color name="fx_mobile_primary_fixed_dim">@color/photonViolet05</color> + <color name="fx_mobile_on_primary_fixed_variant">@color/photonLightGrey05</color> + <color name="fx_mobile_secondary_fixed">#FFE6E0F5</color> + <color name="fx_mobile_secondary_fixed_dim">#FFE6E0F5</color> + <color name="fx_mobile_on_secondary_fixed">@color/photonDarkGrey90</color> + <color name="fx_mobile_on_secondary_fixed_variant">@color/photonLightGrey05</color> + <color name="fx_mobile_tertiary_fixed">@color/photonPink05</color> + <color name="fx_mobile_tertiary_fixed_dim">@color/photonPink05</color> + <color name="fx_mobile_on_tertiary_fixed">@color/photonDarkGrey90</color> + <color name="fx_mobile_on_tertiary_fixed_variant">@color/photonLightGrey05</color> + <!-- Design system color variables --> <!-- Layers --> @@ -158,6 +204,52 @@ <!-- Private theme color variables --> + <!-- Material3 color variables --> + <color name="fx_mobile_private_primary">@color/photonViolet10</color> + <color name="fx_mobile_private_on_primary">@color/photonDarkGrey90</color> + <color name="fx_mobile_private_primary_container">@color/photonViolet80</color> + <color name="fx_mobile_private_on_primary_container">@color/photonLightGrey05</color> + <color name="fx_mobile_private_primary_inverse">@color/photonViolet70</color> + <color name="fx_mobile_private_secondary">@color/photonLightGrey40</color> + <color name="fx_mobile_private_on_secondary">@color/photonDarkGrey90</color> + <color name="fx_mobile_private_secondary_container">#FF4B3974</color> + <color name="fx_mobile_private_on_secondary_container">@color/photonLightGrey05</color> + <color name="fx_mobile_private_tertiary">@color/photonViolet20</color> + <color name="fx_mobile_private_on_tertiary">@color/photonDarkGrey90</color> + <color name="fx_mobile_private_tertiary_container">@color/photonPink80</color> + <color name="fx_mobile_private_on_tertiary_container">@color/photonLightGrey05</color> + <color name="fx_mobile_private_background">@color/photonLightGrey10</color> + <color name="fx_mobile_private_on_background">@color/photonDarkGrey90</color> + <color name="fx_mobile_private_surface">#FF342B4A</color> + <color name="fx_mobile_private_on_surface">@color/photonLightGrey05</color> + <color name="fx_mobile_private_surface_variant">#FF413857</color> + <color name="fx_mobile_private_on_surface_variant">@color/photonLightGrey40</color> + <color name="fx_mobile_private_surface_inverse">@color/photonLightGrey10</color> + <color name="fx_mobile_private_on_surface_inverse">@color/photonDarkGrey90</color> + <color name="fx_mobile_private_error">@color/photonRed20</color> + <color name="fx_mobile_private_on_error">@color/photonDarkGrey90</color> + <color name="fx_mobile_private_error_container">@color/photonRed80</color> + <color name="fx_mobile_private_on_error_container">@color/photonLightGrey05</color> + <color name="fx_mobile_private_outline">@color/photonLightGrey80</color> + <color name="fx_mobile_private_outline_variant">@color/photonDarkGrey05</color> + <color name="fx_mobile_private_surface_bright">#FF413857</color> + <color name="fx_mobile_private_surface_dim">@color/photonInk90</color> + <color name="fx_mobile_private_surface_container">#FF342B4A</color> + <color name="fx_mobile_private_surface_container_high">#FF3B3251</color> + <color name="fx_mobile_private_surface_container_highest">#FF413857</color> + <color name="fx_mobile_private_surface_container_low">#FF281C3D</color> + <color name="fx_mobile_private_surface_container_lowest">@color/photonInk90</color> + <color name="fx_mobile_private_primary_fixed_dim">@color/photonViolet80</color> + <color name="fx_mobile_private_on_primary_fixed_variant">@color/photonDarkGrey90</color> + <color name="fx_mobile_private_secondary_fixed">#FF4B3974</color> + <color name="fx_mobile_private_secondary_fixed_dim">#FF4B3974</color> + <color name="fx_mobile_private_on_secondary_fixed">@color/photonLightGrey05</color> + <color name="fx_mobile_private_on_secondary_fixed_variant">@color/photonDarkGrey90</color> + <color name="fx_mobile_private_tertiary_fixed">@color/photonPink80</color> + <color name="fx_mobile_private_tertiary_fixed_dim">@color/photonPink80</color> + <color name="fx_mobile_private_on_tertiary_fixed">@color/photonLightGrey05</color> + <color name="fx_mobile_private_on_tertiary_fixed_variant">@color/photonDarkGrey90</color> + <!-- Layers --> <!-- Default Screen background, Frontlayer background, App Bar Top, App Bar Bottom, Frontlayer header --> <color name="fx_mobile_private_layer_color_1">@color/photonViolet90</color> diff --git a/mobile/android/fenix/app/src/main/res/values/styles.xml b/mobile/android/fenix/app/src/main/res/values/styles.xml @@ -47,6 +47,54 @@ <item name="mozacSelectCreditCardHeaderTextStyle" tools:ignore="UnusedResources">@style/SelectPromptHeaderTextStyle</item> <item name="mozacSelectAddressHeaderTextStyle" tools:ignore="UnusedResources">@style/SelectPromptHeaderTextStyle</item> + <!-- Material3 --> + <item name="colorPrimary">@color/fx_mobile_primary</item> + <item name="colorOnPrimary">@color/fx_mobile_on_primary</item> + <item name="colorPrimaryContainer">@color/fx_mobile_primary_container</item> + <item name="colorOnPrimaryContainer">@color/fx_mobile_on_primary_container</item> + <item name="colorPrimaryInverse">@color/fx_mobile_primary_inverse</item> + <item name="colorSecondary">@color/fx_mobile_secondary</item> + <item name="colorOnSecondary">@color/fx_mobile_on_secondary</item> + <item name="colorSecondaryContainer">@color/fx_mobile_secondary_container</item> + <item name="colorOnSecondaryContainer">@color/fx_mobile_on_secondary_container</item> + <item name="colorTertiary">@color/fx_mobile_tertiary</item> + <item name="colorOnTertiary">@color/fx_mobile_on_tertiary</item> + <item name="colorTertiaryContainer">@color/fx_mobile_tertiary_container</item> + <item name="colorOnTertiaryContainer">@color/fx_mobile_on_tertiary_container</item> + <item name="android:colorBackground">@color/fx_mobile_background</item> + <item name="colorOnBackground">@color/fx_mobile_on_background</item> + <item name="colorSurface">@color/fx_mobile_surface</item> + <item name="colorOnSurface">@color/fx_mobile_on_surface</item> + <item name="colorSurfaceVariant">@color/fx_mobile_surface_variant</item> + <item name="colorOnSurfaceVariant">@color/fx_mobile_on_surface_variant</item> + <item name="colorSurfaceInverse">@color/fx_mobile_surface_inverse</item> + <item name="colorOnSurfaceInverse">@color/fx_mobile_on_surface_inverse</item> + <item name="colorError">@color/fx_mobile_error</item> + <item name="colorOnError">@color/fx_mobile_on_error</item> + <item name="colorErrorContainer">@color/fx_mobile_error_container</item> + <item name="colorOnErrorContainer">@color/fx_mobile_on_error_container</item> + <item name="colorOutline">@color/fx_mobile_outline</item> + <item name="colorOutlineVariant">@color/fx_mobile_outline_variant</item> + <item name="colorSurfaceBright">@color/fx_mobile_surface_bright</item> + <item name="colorSurfaceDim">@color/fx_mobile_surface_dim</item> + <item name="colorSurfaceContainer">@color/fx_mobile_surface_container</item> + <item name="colorSurfaceContainerHigh">@color/fx_mobile_surface_container_high</item> + <item name="colorSurfaceContainerHighest">@color/fx_mobile_surface_container_highest</item> + <item name="colorSurfaceContainerLow">@color/fx_mobile_surface_container_low</item> + <item name="colorSurfaceContainerLowest">@color/fx_mobile_surface_container_lowest</item> + <item name="colorPrimaryFixed">@color/photonViolet05</item> + <item name="colorPrimaryFixedDim">@color/fx_mobile_primary_fixed_dim</item> + <item name="colorOnPrimaryFixed">@color/photonDarkGrey90</item> + <item name="colorOnPrimaryFixedVariant">@color/fx_mobile_on_primary_fixed_variant</item> + <item name="colorSecondaryFixed">@color/fx_mobile_secondary_fixed</item> + <item name="colorSecondaryFixedDim">@color/fx_mobile_secondary_fixed_dim</item> + <item name="colorOnSecondaryFixed">@color/fx_mobile_on_secondary_fixed</item> + <item name="colorOnSecondaryFixedVariant">@color/fx_mobile_on_secondary_fixed_variant</item> + <item name="colorTertiaryFixed">@color/fx_mobile_tertiary_fixed</item> + <item name="colorTertiaryFixedDim">@color/fx_mobile_tertiary_fixed_dim</item> + <item name="colorOnTertiaryFixed">@color/fx_mobile_on_tertiary_fixed</item> + <item name="colorOnTertiaryFixedVariant">@color/fx_mobile_on_tertiary_fixed_variant</item> + <!-- Design system color attributes --> <!-- Layers --> @@ -289,6 +337,54 @@ <item name="mozacSelectCreditCardHeaderTextStyle" tools:ignore="UnusedResources">@style/SelectPromptHeaderTextStyle</item> <item name="mozacSelectAddressHeaderTextStyle" tools:ignore="UnusedResources">@style/SelectPromptHeaderTextStyle</item> + <!-- Material3 --> + <item name="colorPrimary">@color/fx_mobile_private_primary</item> + <item name="colorOnPrimary">@color/fx_mobile_private_on_primary</item> + <item name="colorPrimaryContainer">@color/fx_mobile_private_primary_container</item> + <item name="colorOnPrimaryContainer">@color/fx_mobile_private_on_primary_container</item> + <item name="colorPrimaryInverse">@color/fx_mobile_private_primary_inverse</item> + <item name="colorSecondary">@color/fx_mobile_private_secondary</item> + <item name="colorOnSecondary">@color/fx_mobile_private_on_secondary</item> + <item name="colorSecondaryContainer">@color/fx_mobile_private_secondary_container</item> + <item name="colorOnSecondaryContainer">@color/fx_mobile_private_on_secondary_container</item> + <item name="colorTertiary">@color/fx_mobile_private_tertiary</item> + <item name="colorOnTertiary">@color/fx_mobile_private_on_tertiary</item> + <item name="colorTertiaryContainer">@color/fx_mobile_private_tertiary_container</item> + <item name="colorOnTertiaryContainer">@color/fx_mobile_private_on_tertiary_container</item> + <item name="android:colorBackground">@color/fx_mobile_private_background</item> + <item name="colorOnBackground">@color/fx_mobile_private_on_background</item> + <item name="colorSurface">@color/fx_mobile_private_surface</item> + <item name="colorOnSurface">@color/fx_mobile_private_on_surface</item> + <item name="colorSurfaceVariant">@color/fx_mobile_private_surface_variant</item> + <item name="colorOnSurfaceVariant">@color/fx_mobile_private_on_surface_variant</item> + <item name="colorSurfaceInverse">@color/fx_mobile_private_surface_inverse</item> + <item name="colorOnSurfaceInverse">@color/fx_mobile_private_on_surface_inverse</item> + <item name="colorError">@color/fx_mobile_private_error</item> + <item name="colorOnError">@color/fx_mobile_private_on_error</item> + <item name="colorErrorContainer">@color/fx_mobile_private_error_container</item> + <item name="colorOnErrorContainer">@color/fx_mobile_private_on_error_container</item> + <item name="colorOutline">@color/fx_mobile_private_outline</item> + <item name="colorOutlineVariant">@color/fx_mobile_private_outline_variant</item> + <item name="colorSurfaceBright">@color/fx_mobile_private_surface_bright</item> + <item name="colorSurfaceDim">@color/fx_mobile_private_surface_dim</item> + <item name="colorSurfaceContainer">@color/fx_mobile_private_surface_container</item> + <item name="colorSurfaceContainerHigh">@color/fx_mobile_private_surface_container_high</item> + <item name="colorSurfaceContainerHighest">@color/fx_mobile_private_surface_container_highest</item> + <item name="colorSurfaceContainerLow">@color/fx_mobile_private_surface_container_low</item> + <item name="colorSurfaceContainerLowest">@color/fx_mobile_private_surface_container_lowest</item> + <item name="colorPrimaryFixed">@color/photonViolet05</item> + <item name="colorPrimaryFixedDim">@color/fx_mobile_private_primary_fixed_dim</item> + <item name="colorOnPrimaryFixed">@color/photonDarkGrey90</item> + <item name="colorOnPrimaryFixedVariant">@color/fx_mobile_private_on_primary_fixed_variant</item> + <item name="colorSecondaryFixed">@color/fx_mobile_private_secondary_fixed</item> + <item name="colorSecondaryFixedDim">@color/fx_mobile_private_secondary_fixed_dim</item> + <item name="colorOnSecondaryFixed">@color/fx_mobile_private_on_secondary_fixed</item> + <item name="colorOnSecondaryFixedVariant">@color/fx_mobile_private_on_secondary_fixed_variant</item> + <item name="colorTertiaryFixed">@color/fx_mobile_private_tertiary_fixed</item> + <item name="colorTertiaryFixedDim">@color/fx_mobile_private_tertiary_fixed_dim</item> + <item name="colorOnTertiaryFixed">@color/fx_mobile_private_on_tertiary_fixed</item> + <item name="colorOnTertiaryFixedVariant">@color/fx_mobile_private_on_tertiary_fixed_variant</item> + <!-- Design system color attributes --> <!-- Layers --> diff --git a/storage/BaseVFS.cpp b/storage/BaseVFS.cpp @@ -9,6 +9,8 @@ #include <string.h> #include "sqlite3.h" +#include "mozilla/Assertions.h" + namespace { // The last VFS version for which this file has been updated. diff --git a/testing/web-platform/meta/fetch/compression-dictionary/dictionary-fetch-with-link-element.tentative.https.html.ini b/testing/web-platform/meta/fetch/compression-dictionary/dictionary-fetch-with-link-element.tentative.https.html.ini @@ -0,0 +1,8 @@ +[Fetch same origin dictionary using link header] + expected: + if (os == "android"): [OK, ERROR] + +[Fetch cross origin dictionary using link element] + expected: + if (os == "android"): [OK, ERROR] + diff --git a/tools/profiler/public/MicroGeckoProfiler.h b/tools/profiler/public/MicroGeckoProfiler.h @@ -19,6 +19,7 @@ extern "C" { #include <mozilla/Types.h> #include <stdio.h> +#include <stdlib.h> #ifdef _WIN32 # include <libloaderapi.h>