Revert 72704 - Defered collect DirectX diagnostics until they are needed for ...

chrome/common/gpu_messages.cc

 // Copyright (c) 2010 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 "base/string_piece.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/common/gpu_create_command_buffer_config.h"
 #include "chrome/common/gpu_info.h"
 #include "chrome/common/dx_diag_node.h"
 #include "gfx/rect.h"
@@ skipping 110 matching lines @@
   LogParam(p.surface_id, l);
   l->append(", ");
   LogParam(p.route_id, l);
   l->append(", ");
   LogParam(p.swap_buffers_count, l);
   l->append(")");
 }
 #endif  // if defined(OS_MACOSX)
 
 void ParamTraits<GPUInfo> ::Write(Message* m, const param_type& p) {
-  WriteParam(m, static_cast<int32>(p.level()));
+  WriteParam(m, static_cast<int32>(p.progress()));
   WriteParam(m, p.initialization_time());
   WriteParam(m, p.vendor_id());
   WriteParam(m, p.device_id());
   WriteParam(m, p.driver_vendor());
   WriteParam(m, p.driver_version());
   WriteParam(m, p.pixel_shader_version());
   WriteParam(m, p.vertex_shader_version());
   WriteParam(m, p.gl_version());
   WriteParam(m, p.gl_version_string());
   WriteParam(m, p.gl_vendor());
   WriteParam(m, p.gl_renderer());
   WriteParam(m, p.gl_extensions());
   WriteParam(m, p.can_lose_context());
 
 #if defined(OS_WIN)
   ParamTraits<DxDiagNode> ::Write(m, p.dx_diagnostics());
 #endif
 }
 
 bool ParamTraits<GPUInfo> ::Read(const Message* m, void** iter, param_type* p) {
-  int32 level;
+  int32 progress;
   base::TimeDelta initialization_time;
   uint32 vendor_id;
   uint32 device_id;
   std::string driver_vendor;
   std::string driver_version;
   uint32 pixel_shader_version;
   uint32 vertex_shader_version;
   uint32 gl_version;
   std::string gl_version_string;
   std::string gl_vendor;
   std::string gl_renderer;
   std::string gl_extensions;
   bool can_lose_context;
-  bool ret = ReadParam(m, iter, &level);
+  bool ret = ReadParam(m, iter, &progress);
   ret = ret && ReadParam(m, iter, &initialization_time);
   ret = ret && ReadParam(m, iter, &vendor_id);
   ret = ret && ReadParam(m, iter, &device_id);
   ret = ret && ReadParam(m, iter, &driver_vendor);
   ret = ret && ReadParam(m, iter, &driver_version);
   ret = ret && ReadParam(m, iter, &pixel_shader_version);
   ret = ret && ReadParam(m, iter, &vertex_shader_version);
   ret = ret && ReadParam(m, iter, &gl_version);
   ret = ret && ReadParam(m, iter, &gl_version_string);
   ret = ret && ReadParam(m, iter, &gl_vendor);
   ret = ret && ReadParam(m, iter, &gl_renderer);
   ret = ret && ReadParam(m, iter, &gl_extensions);
   ret = ret && ReadParam(m, iter, &can_lose_context);
-  p->SetLevel(static_cast<GPUInfo::Level>(level));
+  p->SetProgress(static_cast<GPUInfo::Progress>(progress));
   if (!ret)
     return false;
 
   p->SetInitializationTime(initialization_time);
   p->SetVideoCardInfo(vendor_id, device_id);
   p->SetDriverInfo(driver_vendor, driver_version);
   p->SetShaderVersion(pixel_shader_version, vertex_shader_version);
   p->SetGLVersion(gl_version);
   p->SetGLVersionString(gl_version_string);
   p->SetGLVendor(gl_vendor);
   p->SetGLRenderer(gl_renderer);
   p->SetGLExtensions(gl_extensions);
   p->SetCanLoseContext(can_lose_context);
 
 #if defined(OS_WIN)
   DxDiagNode dx_diagnostics;
   if (!ReadParam(m, iter, &dx_diagnostics))
     return false;
 
   p->SetDxDiagnostics(dx_diagnostics);
 #endif
 
   return true;
 }
 
 void ParamTraits<GPUInfo> ::Log(const param_type& p, std::string* l) {
   l->append(base::StringPrintf("<GPUInfo> %d %d %x %x %s %s %x %x %x %d",
-                               p.level(),
+                               p.progress(),
                                static_cast<int32>(
                                    p.initialization_time().InMilliseconds()),
                                p.vendor_id(),
                                p.device_id(),
                                p.driver_vendor().c_str(),
                                p.driver_version().c_str(),
                                p.pixel_shader_version(),
                                p.vertex_shader_version(),
                                p.gl_version(),
                                p.can_lose_context()));
 }
 
-
-void ParamTraits<GPUInfo::Level> ::Write(Message* m, const param_type& p) {
-  WriteParam(m, static_cast<int32>(p));
-}
-
-bool ParamTraits<GPUInfo::Level> ::Read(const Message* m,
-                                    void** iter,
-                                    param_type* p) {
-  int32 level;
-  bool ret = ReadParam(m, iter, &level);
-  *p = static_cast<GPUInfo::Level>(level);
-  return ret;
-}
-
-void ParamTraits<GPUInfo::Level> ::Log(const param_type& p, std::string* l) {
-  LogParam(static_cast<int32>(p), l);
-}
-
 void ParamTraits<DxDiagNode> ::Write(Message* m, const param_type& p) {
   WriteParam(m, p.values);
   WriteParam(m, p.children);
 }
 
 bool ParamTraits<DxDiagNode> ::Read(const Message* m,
                                     void** iter,
                                     param_type* p) {
   bool ret = ReadParam(m, iter, &p->values);
   ret = ret && ReadParam(m, iter, &p->children);
@@ skipping 48 matching lines @@
   }
   return true;
 }
 
 void ParamTraits<GPUCreateCommandBufferConfig> ::Log(
     const param_type& p, std::string* l) {
   l->append("<GPUCreateCommandBufferConfig>");
 }
 
 }  // namespace IPC