Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1616)

Unified Diff: content/child/runtime_features.cc

Issue 2379053004: Reland "Let features::kScrollAnchoring disable the Blink REF" (r422244). (Closed)
Patch Set: don't override --enable-experimental-web-platform-features Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698