Revert 86510 - Contributed by junov@chromium.org

content/browser/gpu/gpu_data_manager.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/gpu/gpu_data_manager.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 52 matching lines @@
 
 const GPUInfo& GpuDataManager::gpu_info() const {
   base::AutoLock auto_lock(gpu_info_lock_);
   return gpu_info_;
 }
 
 Value* GpuDataManager::GetFeatureStatus() {
   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::kDisableAccelerated2dCanvas),
+        browser_command_line.HasSwitch(switches::kDisableAcceleratedCompositing),
+        browser_command_line.HasSwitch(switches::kEnableAccelerated2dCanvas),
         browser_command_line.HasSwitch(switches::kDisableExperimentalWebGL),
         browser_command_line.HasSwitch(switches::kDisableGLMultisampling));
   return NULL;
 }
 
 std::string GpuDataManager::GetBlacklistVersion() const {
   if (gpu_blacklist_.get() != NULL) {
     uint16 version_major, version_minor;
     if (gpu_blacklist_->GetVersion(&version_major,
                                    &version_minor)) {
@@ skipping 57 matching lines @@
   if ((flags & GpuFeatureFlags::kGpuFeatureWebgl) &&
       !command_line->HasSwitch(switches::kDisableExperimentalWebGL))
     command_line->AppendSwitch(switches::kDisableExperimentalWebGL);
   if ((flags & GpuFeatureFlags::kGpuFeatureMultisampling) &&
       !command_line->HasSwitch(switches::kDisableGLMultisampling))
     command_line->AppendSwitch(switches::kDisableGLMultisampling);
   // If we have kGpuFeatureAcceleratedCompositing, we disable all GPU features.
   if (flags & GpuFeatureFlags::kGpuFeatureAcceleratedCompositing) {
     const char* switches[] = {
         switches::kDisableAcceleratedCompositing,
-        switches::kDisableExperimentalWebGL,
-        switches::kDisableAccelerated2dCanvas
+        switches::kDisableExperimentalWebGL
     };
     const int switch_count = sizeof(switches) / sizeof(char*);
     for (int i = 0; i < switch_count; ++i) {
       if (!command_line->HasSwitch(switches[i]))
         command_line->AppendSwitch(switches[i]);
     }
   }
 }
 
 void GpuDataManager::SetBuiltInGpuBlacklist(GpuBlacklist* built_in_list) {
@@ skipping 102 matching lines @@
   const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
   if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) ||
       browser_command_line.GetSwitchValueASCII(
           switches::kUseGL) == gfx::kGLImplementationOSMesaName)
     return NULL;
   // No need to return an empty blacklist.
   if (gpu_blacklist_.get() != NULL && gpu_blacklist_->max_entry_id() == 0)
     return NULL;
   return gpu_blacklist_.get();
 }