| Index: content/browser/gpu/gpu_data_manager.cc
|
| ===================================================================
|
| --- content/browser/gpu/gpu_data_manager.cc (revision 86432)
|
| +++ content/browser/gpu/gpu_data_manager.cc (working copy)
|
| @@ -62,8 +62,10 @@
|
| const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
|
| if (gpu_blacklist_.get())
|
| return gpu_blacklist_->GetFeatureStatus(GpuAccessAllowed(),
|
| - browser_command_line.HasSwitch(switches::kDisableAcceleratedCompositing),
|
| - browser_command_line.HasSwitch(switches::kEnableAccelerated2dCanvas),
|
| + browser_command_line.HasSwitch(
|
| + switches::kDisableAcceleratedCompositing),
|
| + browser_command_line.HasSwitch(
|
| + switches::kDisableAccelerated2dCanvas),
|
| browser_command_line.HasSwitch(switches::kDisableExperimentalWebGL),
|
| browser_command_line.HasSwitch(switches::kDisableGLMultisampling));
|
| return NULL;
|
| @@ -142,7 +144,8 @@
|
| if (flags & GpuFeatureFlags::kGpuFeatureAcceleratedCompositing) {
|
| const char* switches[] = {
|
| switches::kDisableAcceleratedCompositing,
|
| - switches::kDisableExperimentalWebGL
|
| + switches::kDisableExperimentalWebGL,
|
| + switches::kDisableAccelerated2dCanvas
|
| };
|
| const int switch_count = sizeof(switches) / sizeof(char*);
|
| for (int i = 0; i < switch_count; ++i) {
|
|
|