diff options
Diffstat (limited to 'www/chromium/files/patch-content_public_common_content__features.cc')
| -rw-r--r-- | www/chromium/files/patch-content_public_common_content__features.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc index 5b52891efbd6..875a7fab26fc 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,15 +1,15 @@ ---- content/public/common/content_features.cc.orig 2021-01-18 21:28:57 UTC +--- content/public/common/content_features.cc.orig 2021-03-12 23:57:24 UTC +++ content/public/common/content_features.cc -@@ -49,7 +49,7 @@ const base::Feature kAudioServiceLaunchOnStartup{ - const base::Feature kAudioServiceOutOfProcess { - "AudioServiceOutOfProcess", +@@ -45,7 +45,7 @@ const base::Feature kAudioServiceOutOfProcess { + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -758,8 +758,8 @@ const base::Feature kWebAssemblyThreads { +@@ -773,8 +773,8 @@ const base::Feature kWebAssemblyThreads { }; // Enable WebAssembly trap handler. @@ -20,12 +20,12 @@ defined(ARCH_CPU_X86_64) const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler", base::FEATURE_ENABLED_BY_DEFAULT}; -@@ -789,7 +789,7 @@ const base::Feature kWebAuth{"WebAuthentication", - // https://w3c.github.io/webauthn - const base::Feature kWebAuthCable { +@@ -795,7 +795,7 @@ const base::Feature kWebAuthCable { "WebAuthenticationCable", --#if !defined(OS_CHROMEOS) && defined(OS_LINUX) -+#if (!defined(OS_CHROMEOS) && defined(OS_LINUX)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX) || defined(OS_BSD) base::FEATURE_DISABLED_BY_DEFAULT #else base::FEATURE_ENABLED_BY_DEFAULT |