Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/child/runtime_features.h" | 5 #include "content/child/runtime_features.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/feature_list.h" | 10 #include "base/feature_list.h" |
| (...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 307 WebRuntimeFeatures::enableSendBeaconThrowForBlobWithNonSimpleType(true); | 307 WebRuntimeFeatures::enableSendBeaconThrowForBlobWithNonSimpleType(true); |
| 308 | 308 |
| 309 #if defined(OS_ANDROID) | 309 #if defined(OS_ANDROID) |
| 310 if (command_line.HasSwitch(switches::kDisableMediaSessionAPI)) | 310 if (command_line.HasSwitch(switches::kDisableMediaSessionAPI)) |
| 311 WebRuntimeFeatures::enableMediaSession(false); | 311 WebRuntimeFeatures::enableMediaSession(false); |
| 312 | 312 |
| 313 WebRuntimeFeatures::enablePaymentRequest( | 313 WebRuntimeFeatures::enablePaymentRequest( |
| 314 base::FeatureList::IsEnabled(features::kWebPayments)); | 314 base::FeatureList::IsEnabled(features::kWebPayments)); |
| 315 #endif | 315 #endif |
| 316 | 316 |
| 317 if (base::FeatureList::IsEnabled(features::kServiceWorkerNavigationPreload)) | 317 if (base::FeatureList::GetInstance()->IsFeatureOverriddenFromCommandLine( |
|
falken
2017/01/13 03:43:41
Let's add a comment about why this is using IsFeat
horo
2017/01/13 08:41:32
Done.
| |
| 318 features::kServiceWorkerNavigationPreload.name, | |
| 319 base::FeatureList::OVERRIDE_ENABLE_FEATURE)) { | |
| 318 WebRuntimeFeatures::enableServiceWorkerNavigationPreload(true); | 320 WebRuntimeFeatures::enableServiceWorkerNavigationPreload(true); |
| 321 } | |
| 319 | 322 |
| 320 if (base::FeatureList::IsEnabled(features::kSpeculativeLaunchServiceWorker)) | 323 if (base::FeatureList::IsEnabled(features::kSpeculativeLaunchServiceWorker)) |
| 321 WebRuntimeFeatures::enableSpeculativeLaunchServiceWorker(true); | 324 WebRuntimeFeatures::enableSpeculativeLaunchServiceWorker(true); |
| 322 | 325 |
| 323 if (base::FeatureList::IsEnabled(features::kGamepadExtensions)) | 326 if (base::FeatureList::IsEnabled(features::kGamepadExtensions)) |
| 324 WebRuntimeFeatures::enableGamepadExtensions(true); | 327 WebRuntimeFeatures::enableGamepadExtensions(true); |
| 325 | 328 |
| 326 if (!base::FeatureList::IsEnabled(features::kCompositeOpaqueFixedPosition)) | 329 if (!base::FeatureList::IsEnabled(features::kCompositeOpaqueFixedPosition)) |
| 327 WebRuntimeFeatures::enableFeatureFromString("CompositeOpaqueFixedPosition", | 330 WebRuntimeFeatures::enableFeatureFromString("CompositeOpaqueFixedPosition", |
| 328 false); | 331 false); |
| (...skipping 26 matching lines...) Expand all Loading... | |
| 355 if (command_line.HasSwitch(switches::kDisableBlinkFeatures)) { | 358 if (command_line.HasSwitch(switches::kDisableBlinkFeatures)) { |
| 356 std::vector<std::string> disabled_features = base::SplitString( | 359 std::vector<std::string> disabled_features = base::SplitString( |
| 357 command_line.GetSwitchValueASCII(switches::kDisableBlinkFeatures), | 360 command_line.GetSwitchValueASCII(switches::kDisableBlinkFeatures), |
| 358 ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); | 361 ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); |
| 359 for (const std::string& feature : disabled_features) | 362 for (const std::string& feature : disabled_features) |
| 360 WebRuntimeFeatures::enableFeatureFromString(feature, false); | 363 WebRuntimeFeatures::enableFeatureFromString(feature, false); |
| 361 } | 364 } |
| 362 } | 365 } |
| 363 | 366 |
| 364 } // namespace content | 367 } // namespace content |
| OLD | NEW |