Revert 130299 - Revert 130298 - Revert 130258 - Make it possible to blacklist gpu's based on the Wi…

content/browser/gpu/gpu_data_manager.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/gpu_data_manager.h"
 
 #if defined(OS_MACOSX)
 #include <CoreGraphics/CGDisplayConfiguration.h>
 #endif
 
@@ skipping 379 matching lines @@
     GpuBlacklist* blacklist = GetGpuBlacklist();
     if (blacklist)
       blacklist->GetBlacklistReasons(problem_list);
 
     status->Set("problems", problem_list);
   }
 
   return status;
 }
 
+GpuPerformanceStats GpuDataManager::GetPerformanceStats() const {
+  return GpuPerformanceStats::RetrieveGpuPerformanceStats();
+}
+
 std::string GpuDataManager::GetBlacklistVersion() const {
   GpuBlacklist* blacklist = GetGpuBlacklist();
   if (blacklist != NULL) {
     uint16 version_major, version_minor;
     if (blacklist->GetVersion(&version_major, &version_minor)) {
       std::string version_string =
           base::UintToString(static_cast<unsigned>(version_major)) +
           "." +
           base::UintToString(static_cast<unsigned>(version_minor));
       return version_string;
@@ skipping 144 matching lines @@
                                              gpu_info().gl_renderer));
   basic_info->Append(NewDescriptionValuePair("GL_VERSION",
                                              gpu_info().gl_version_string));
   basic_info->Append(NewDescriptionValuePair("GL_EXTENSIONS",
                                              gpu_info().gl_extensions));
 
   DictionaryValue* info = new DictionaryValue();
   info->Set("basic_info", basic_info);
 
 #if defined(OS_WIN)
-  ListValue* perf_info = new ListValue();
-  perf_info->Append(NewDescriptionValuePair(
-      "Graphics",
-      base::StringPrintf("%.1f", gpu_info.performance_stats.graphics)));
-  perf_info->Append(NewDescriptionValuePair(
-      "Gaming",
-      base::StringPrintf("%.1f", gpu_info.performance_stats.gaming)));
-  perf_info->Append(NewDescriptionValuePair(
-      "Overall",
-      base::StringPrintf("%.1f", gpu_info.performance_stats.overall)));
-  info->Set("performance_info", perf_info);
-
   Value* dx_info;
   if (gpu_info().dx_diagnostics.children.size())
     dx_info = DxDiagNodeToList(gpu_info().dx_diagnostics);
   else
     dx_info = Value::CreateNullValue();
   info->Set("diagnostics", dx_info);
 #endif
 
   return info;
 }
@@ skipping 206 matching lines @@
 bool GpuDataManager::supportsAccelerated2dCanvas() const {
   if (gpu_info_.can_lose_context)
     return false;
 #if defined(USE_SKIA)
   return true;
 #else
   return false;
 #endif
 }