| Index: content/child/runtime_features.cc
|
| diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
|
| index c70a850ca8ed284eef8f76e00a6a65556513382d..2e723340de20f6eceff2916b558004860b572493 100644
|
| --- a/content/child/runtime_features.cc
|
| +++ b/content/child/runtime_features.cc
|
| @@ -145,14 +145,17 @@
|
| if (command_line.HasSwitch(switches::kEnableAcceleratedJpegDecoding))
|
| WebRuntimeFeatures::enableDecodeToYUV(true);
|
|
|
| - if (command_line.HasSwitch(switches::kEnableDisplayList2dCanvas))
|
| + if (command_line.HasSwitch(switches::kDisableDisplayList2dCanvas)) {
|
| + WebRuntimeFeatures::enableDisplayList2dCanvas(false);
|
| + } else if (command_line.HasSwitch(switches::kForceDisplayList2dCanvas)) {
|
| + WebRuntimeFeatures::forceDisplayList2dCanvas(true);
|
| + } else if (command_line.HasSwitch(switches::kEnableDisplayList2dCanvas)) {
|
| WebRuntimeFeatures::enableDisplayList2dCanvas(true);
|
| -
|
| - if (command_line.HasSwitch(switches::kDisableDisplayList2dCanvas))
|
| - WebRuntimeFeatures::enableDisplayList2dCanvas(false);
|
| -
|
| - if (command_line.HasSwitch(switches::kForceDisplayList2dCanvas))
|
| - WebRuntimeFeatures::forceDisplayList2dCanvas(true);
|
| + } else {
|
| + WebRuntimeFeatures::enableDisplayList2dCanvas(
|
| + base::FieldTrialList::FindFullName("DisplayList2dCanvas") == "Enabled"
|
| + );
|
| + }
|
|
|
| if (command_line.HasSwitch(switches::kEnableWebGLDraftExtensions))
|
| WebRuntimeFeatures::enableWebGLDraftExtensions(true);
|
|
|