diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /www/iridium/files/patch-content_public_common_content__features.cc | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'www/iridium/files/patch-content_public_common_content__features.cc')
| -rw-r--r-- | www/iridium/files/patch-content_public_common_content__features.cc | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/www/iridium/files/patch-content_public_common_content__features.cc b/www/iridium/files/patch-content_public_common_content__features.cc index 3e2c080be6e7..0c8bcab3f36f 100644 --- a/www/iridium/files/patch-content_public_common_content__features.cc +++ b/www/iridium/files/patch-content_public_common_content__features.cc @@ -1,27 +1,28 @@ ---- content/public/common/content_features.cc.orig 2025-09-11 13:19:19 UTC +--- content/public/common/content_features.cc.orig 2025-11-06 10:11:34 UTC +++ content/public/common/content_features.cc -@@ -103,7 +103,7 @@ BASE_FEATURE(kAudioServiceLaunchOnStartup, +@@ -95,7 +95,7 @@ BASE_FEATURE(kAudioServiceLaunchOnStartup, base::FEATU + // Runs the audio service in a separate process. BASE_FEATURE(kAudioServiceOutOfProcess, - "AudioServiceOutOfProcess", -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1394,9 +1394,9 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1152,10 +1152,10 @@ BASE_FEATURE(kWebAssemblyTiering, base::FEATURE_ENABLE + + // Enable WebAssembly trap handler. BASE_FEATURE(kWebAssemblyTrapHandler, - "WebAssemblyTrapHandler", - #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_MAC)) && \ -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) && \ +-#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ ++#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ + BUILDFLAG(IS_MAC)) && \ defined(ARCH_CPU_X86_64)) || \ - ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)) && \ -+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) && \ ++ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)) && \ defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -1453,7 +1453,11 @@ BASE_FEATURE(kWebUIJSErrorReportingExtended, +@@ -1203,7 +1203,11 @@ BASE_FEATURE(kWebUIJSErrorReportingExtended, base::FEA // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb |