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 | 16 |
1 files changed, 9 insertions, 7 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 d0a541e86aeb..863f2389701e 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,24 +1,26 @@ ---- content/public/common/content_features.cc.orig 2020-07-07 21:58:15 UTC +--- content/public/common/content_features.cc.orig 2020-11-13 06:36:43 UTC +++ content/public/common/content_features.cc -@@ -48,7 +48,7 @@ const base::Feature kAudioServiceLaunchOnStartup{ +@@ -54,7 +54,7 @@ const base::Feature kAudioServiceLaunchOnStartup{ const base::Feature kAudioServiceOutOfProcess { "AudioServiceOutOfProcess", - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -730,7 +730,7 @@ const base::Feature kWebAssemblyThreads { +@@ -776,8 +776,8 @@ const base::Feature kWebAssemblyThreads { }; // Enable WebAssembly trap handler. --#if (defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)) && \ -+#if (defined(OS_BSD) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)) && \ +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \ +- defined(OS_MAC)) && \ ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) || \ ++ defined(OS_MAC)) && \ defined(ARCH_CPU_X86_64) const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler", base::FEATURE_ENABLED_BY_DEFAULT}; -@@ -760,7 +760,7 @@ const base::Feature kWebAuth{"WebAuthentication", +@@ -807,7 +807,7 @@ const base::Feature kWebAuth{"WebAuthentication", // https://w3c.github.io/webauthn const base::Feature kWebAuthCable { "WebAuthenticationCable", |