1 --- content/public/common/content_features.cc.orig 2022-08-31 12:19:35 UTC 2 +++ content/public/common/content_features.cc 3 @@ -43,7 +43,7 @@ const base::Feature kAudioServiceOutOfProcess { 4 "AudioServiceOutOfProcess", 5 // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being 6 // built with OS_CHROMEOS instead of OS_LINUX. 7 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ 8 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ 9 (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) 10 base::FEATURE_ENABLED_BY_DEFAULT 11 #else 12 @@ -55,7 +55,7 @@ const base::Feature kAudioServiceOutOfProcess { 13 // kAudioServiceOutOfProcess feature is enabled. 14 const base::Feature kAudioServiceSandbox { 15 "AudioServiceSandbox", 16 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) 17 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) 18 base::FEATURE_ENABLED_BY_DEFAULT 19 #else 20 base::FEATURE_DISABLED_BY_DEFAULT 21 @@ -1057,7 +1057,7 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB 22 const base::Feature kWebAssemblyCodeProtection{ 23 "WebAssemblyCodeProtection", base::FEATURE_ENABLED_BY_DEFAULT}; 24 25 -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) 26 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) 27 // Use memory protection keys in userspace (PKU) (if available) to protect code 28 // JITed for WebAssembly. Fall back to traditional memory protection if 29 // WebAssemblyCodeProtection is also enabled. 30 @@ -1093,7 +1093,7 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi 31 const base::Feature kWebAssemblyTrapHandler { 32 "WebAssemblyTrapHandler", 33 #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ 34 - BUILDFLAG(IS_MAC)) && \ 35 + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) && \ 36 defined(ARCH_CPU_X86_64)) || \ 37 (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) 38 base::FEATURE_ENABLED_BY_DEFAULT 39 @@ -1163,7 +1163,11 @@ const base::Feature kWebUIReportOnlyTrustedTypes{ 40 41 // Controls whether the WebUSB API is enabled: 42 // https://wicg.github.io/webusb 43 +#if BUILDFLAG(IS_BSD) 44 +const base::Feature kWebUsb{"WebUSB", base::FEATURE_DISABLED_BY_DEFAULT}; 45 +#else 46 const base::Feature kWebUsb{"WebUSB", base::FEATURE_ENABLED_BY_DEFAULT}; 47 +#endif 48 49 // Controls whether the WebXR Device API is enabled. 50 const base::Feature kWebXr{"WebXR", base::FEATURE_ENABLED_BY_DEFAULT}; 51