aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-content_public_common_content__features.cc
diff options
context:
space:
mode:
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.cc24
1 files changed, 20 insertions, 4 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 4516a60d7ece..8e911845dda6 100644
--- a/www/chromium/files/patch-content_public_common_content__features.cc
+++ b/www/chromium/files/patch-content_public_common_content__features.cc
@@ -1,4 +1,4 @@
---- content/public/common/content_features.cc.orig 2021-05-12 22:05:53 UTC
+--- content/public/common/content_features.cc.orig 2021-07-19 18:45:16 UTC
+++ content/public/common/content_features.cc
@@ -50,7 +50,7 @@ const base::Feature kAudioServiceOutOfProcess {
// TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being
@@ -9,8 +9,24 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -821,8 +821,8 @@ const base::Feature kWebAssemblyThreads {
- };
+@@ -851,13 +851,13 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB
+ const base::Feature kWebAssemblyCodeProtection{
+ "WebAssemblyCodeProtection", base::FEATURE_DISABLED_BY_DEFAULT};
+
+-#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64)
+ // Use memory protection keys in userspace (PKU) (if available) to protect code
+ // JITed for WebAssembly. Fall back to traditional memory protection if
+ // WebAssemblyCodeProtection is also enabled.
+ const base::Feature kWebAssemblyCodeProtectionPku{
+ "WebAssemblyCodeProtectionPku", base::FEATURE_DISABLED_BY_DEFAULT};
+-#endif // defined(OS_LINUX) && defined(ARCH_CPU_X86_64)
++#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64)
+
+ // Enable WebAssembly lazy compilation (JIT on first call).
+ const base::Feature kWebAssemblyLazyCompilation{
+@@ -873,8 +873,8 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi
+ base::FEATURE_ENABLED_BY_DEFAULT};
// Enable WebAssembly trap handler.
-#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \
@@ -20,7 +36,7 @@
defined(ARCH_CPU_X86_64)
const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler",
base::FEATURE_ENABLED_BY_DEFAULT};
-@@ -844,7 +844,7 @@ const base::Feature kWebAuthCable {
+@@ -896,7 +896,7 @@ const base::Feature kWebAuthCable {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
// If updating this, also update kWebAuthCableServerLink.