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 | 21 |
1 files changed, 15 insertions, 6 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 228177dc69a0..c81eb3c51df9 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,11 +1,20 @@ ---- content/public/common/content_features.cc.orig 2019-03-24 18:52:00.447438000 +0100 -+++ content/public/common/content_features.cc 2019-03-24 18:52:16.870073000 +0100 -@@ -493,7 +493,7 @@ - base::FEATURE_DISABLED_BY_DEFAULT}; +--- content/public/common/content_features.cc.orig 2019-04-30 22:22:47 UTC ++++ content/public/common/content_features.cc +@@ -541,7 +541,7 @@ const base::Feature kWebAssemblyThreads { + }; // Enable WebAssembly trap handler. --#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_X86_64) +-#if (defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)) && \ ++#if (defined(OS_BSD) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)) && \ + defined(ARCH_CPU_X86_64) const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler", base::FEATURE_ENABLED_BY_DEFAULT}; +@@ -576,7 +576,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle" + // https://w3c.github.io/webauthn + const base::Feature kWebAuthCable { + "WebAuthenticationCable", +-#if !defined(OS_CHROMEOS) && defined(OS_LINUX) ++#if (!defined(OS_CHROMEOS) && defined(OS_LINUX)) || defined(OS_BSD) + base::FEATURE_DISABLED_BY_DEFAULT #else + base::FEATURE_ENABLED_BY_DEFAULT |