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 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
352 false); | 352 false); |
353 if (base::FeatureList::IsEnabled(features::kCompositorTouchAction)) | 353 if (base::FeatureList::IsEnabled(features::kCompositorTouchAction)) |
354 WebRuntimeFeatures::EnableCompositorTouchAction(true); | 354 WebRuntimeFeatures::EnableCompositorTouchAction(true); |
355 | 355 |
356 if (base::FeatureList::IsEnabled(features::kSkipCompositingSmallScrollers)) | 356 if (base::FeatureList::IsEnabled(features::kSkipCompositingSmallScrollers)) |
357 WebRuntimeFeatures::EnableSkipCompositingSmallScrollers(true); | 357 WebRuntimeFeatures::EnableSkipCompositingSmallScrollers(true); |
358 | 358 |
359 if (base::FeatureList::IsEnabled(features::kGenericSensor)) | 359 if (base::FeatureList::IsEnabled(features::kGenericSensor)) |
360 WebRuntimeFeatures::EnableGenericSensor(true); | 360 WebRuntimeFeatures::EnableGenericSensor(true); |
361 | 361 |
362 if (base::FeatureList::IsEnabled(features::kLoadingWithMojo)) | 362 if (base::FeatureList::IsEnabled(features::kLoadingWithMojo) || |
| 363 base::FeatureList::IsEnabled(features::kNetworkService)) |
363 WebRuntimeFeatures::EnableLoadingWithMojo(true); | 364 WebRuntimeFeatures::EnableLoadingWithMojo(true); |
364 | 365 |
365 WebRuntimeFeatures::EnableMediaCastOverlayButton( | 366 WebRuntimeFeatures::EnableMediaCastOverlayButton( |
366 base::FeatureList::IsEnabled(media::kMediaCastOverlayButton)); | 367 base::FeatureList::IsEnabled(media::kMediaCastOverlayButton)); |
367 | 368 |
368 if (!base::FeatureList::IsEnabled(features::kBlockCredentialedSubresources)) { | 369 if (!base::FeatureList::IsEnabled(features::kBlockCredentialedSubresources)) { |
369 WebRuntimeFeatures::EnableFeatureFromString("BlockCredentialedSubresources", | 370 WebRuntimeFeatures::EnableFeatureFromString("BlockCredentialedSubresources", |
370 false); | 371 false); |
371 } | 372 } |
372 | 373 |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
407 if (command_line.HasSwitch(switches::kDisableBlinkFeatures)) { | 408 if (command_line.HasSwitch(switches::kDisableBlinkFeatures)) { |
408 std::vector<std::string> disabled_features = base::SplitString( | 409 std::vector<std::string> disabled_features = base::SplitString( |
409 command_line.GetSwitchValueASCII(switches::kDisableBlinkFeatures), | 410 command_line.GetSwitchValueASCII(switches::kDisableBlinkFeatures), |
410 ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); | 411 ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); |
411 for (const std::string& feature : disabled_features) | 412 for (const std::string& feature : disabled_features) |
412 WebRuntimeFeatures::EnableFeatureFromString(feature, false); | 413 WebRuntimeFeatures::EnableFeatureFromString(feature, false); |
413 } | 414 } |
414 } | 415 } |
415 | 416 |
416 } // namespace content | 417 } // namespace content |
OLD | NEW |