Make consistent with Accelerated 2D Canvas flag on both implementation and chrome://gpu.

content/browser/gpu/compositor_util.cc

 // Copyright (c) 2012 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/compositor_util.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "cc/base/switches.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/public/common/content_switches.h"
 #include "gpu/config/gpu_feature_type.h"
 
 namespace content {
 
 namespace {
 
 struct GpuFeatureInfo {
   std::string name;
   uint32 blocked;
   bool disabled;
   std::string disabled_description;
   bool fallback_to_software;
 };
 
-// Determine if accelerated-2d-canvas is supported, which depends on whether
-// lose_context could happen.
-bool SupportsAccelerated2dCanvas() {
-  if (GpuDataManagerImpl::GetInstance()->GetGPUInfo().can_lose_context)
-    return false;
-  return true;
-}
-
 #if defined(OS_CHROMEOS)
 const size_t kNumFeatures = 14;
 #else
 const size_t kNumFeatures = 13;
 #endif
 const GpuFeatureInfo GetGpuFeatureInfo(size_t index) {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   GpuDataManagerImpl* manager = GpuDataManagerImpl::GetInstance();
 
   const GpuFeatureInfo kGpuFeatureInfo[] = {
       {
           "2d_canvas",
           manager->IsFeatureBlacklisted(
               gpu::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS),
           command_line.HasSwitch(switches::kDisableAccelerated2dCanvas) ||
-          !SupportsAccelerated2dCanvas(),
+          !GpuDataManagerImpl::GetInstance()->
+              GetGPUInfo().SupportsAccelerated2dCanvas(),
           "Accelerated 2D canvas is unavailable: either disabled at the command"
           " line or not supported by the current system.",
           true
       },
       {
           "compositing",
           manager->IsFeatureBlacklisted(
               gpu::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING),
           command_line.HasSwitch(switches::kDisableAcceleratedCompositing),
           "Accelerated compositing has been disabled, either via about:flags or"
@@ skipping 340 matching lines @@
   return problem_list;
 }
 
 base::Value* GetDriverBugWorkarounds() {
   base::ListValue* workaround_list = new base::ListValue();
   GpuDataManagerImpl::GetInstance()->GetDriverBugWorkarounds(workaround_list);
   return workaround_list;
 }
 
 }  // namespace content