Index: content/child/runtime_features.cc |
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc |
index 487fc375e170d4022cd337d57c1fdd0e932dcaaa..820ee745b8523aed829e54cde56c0e1f2eff16e9 100644 |
--- a/content/child/runtime_features.cc |
+++ b/content/child/runtime_features.cc |
@@ -58,7 +58,9 @@ static void SetRuntimeFeatureDefaultsForPlatform() { |
void SetRuntimeFeaturesDefaultsAndUpdateFromArgs( |
const base::CommandLine& command_line) { |
- if (command_line.HasSwitch(switches::kEnableExperimentalWebPlatformFeatures)) |
+ bool enableExperimentalWebPlatformFeatures = command_line.HasSwitch( |
+ switches::kEnableExperimentalWebPlatformFeatures); |
+ if (enableExperimentalWebPlatformFeatures) |
WebRuntimeFeatures::enableExperimentalFeatures(true); |
WebRuntimeFeatures::enableOriginTrials( |
@@ -164,8 +166,7 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs( |
WebRuntimeFeatures::enablePreciseMemoryInfo(true); |
if (command_line.HasSwitch(switches::kEnableNetworkInformation) || |
- command_line.HasSwitch( |
- switches::kEnableExperimentalWebPlatformFeatures)) { |
+ enableExperimentalWebPlatformFeatures) { |
WebRuntimeFeatures::enableNetworkInformation(true); |
} |
@@ -230,8 +231,9 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs( |
if (command_line.HasSwitch(switches::kEnableWebFontsInterventionTrigger)) |
WebRuntimeFeatures::enableWebFontsInterventionTrigger(true); |
- if (base::FeatureList::IsEnabled(features::kScrollAnchoring)) |
- WebRuntimeFeatures::enableScrollAnchoring(true); |
+ WebRuntimeFeatures::enableScrollAnchoring( |
+ base::FeatureList::IsEnabled(features::kScrollAnchoring) || |
+ enableExperimentalWebPlatformFeatures); |
if (command_line.HasSwitch(switches::kEnableSlimmingPaintV2)) |
WebRuntimeFeatures::enableSlimmingPaintV2(true); |