Index: chrome/common/gpu_messages.h |
diff --git a/chrome/common/gpu_messages.h b/chrome/common/gpu_messages.h |
index f044b2f3bcd62203c7c5c7f0f784ad82439299d7..fd0583c81b56141e5575e0c933779c8db2875346 100644 |
--- a/chrome/common/gpu_messages.h |
+++ b/chrome/common/gpu_messages.h |
@@ -9,13 +9,12 @@ |
#include "base/basictypes.h" |
#include "base/process.h" |
#include "chrome/common/common_param_traits.h" |
-#include "chrome/common/gpu_info.h" |
#include "chrome/common/gpu_native_window_handle.h" |
#include "gfx/native_widget_types.h" |
-#include "gfx/rect.h" |
-#include "gfx/size.h" |
#include "gpu/command_buffer/common/command_buffer.h" |
+class GPUInfo; |
+ |
#if defined(OS_MACOSX) |
// Parameters for the GpuHostMsg_AcceleratedSurfaceSetIOSurface |
// message, which has too many parameters to be sent with the |
@@ -81,36 +80,9 @@ struct ParamTraits<GpuHostMsg_AcceleratedSurfaceSetIOSurface_Params> { |
template <> |
struct ParamTraits<GPUInfo> { |
typedef GPUInfo param_type; |
- static void Write(Message* m, const param_type& p) { |
- m->WriteUInt32(p.vendor_id()); |
- m->WriteUInt32(p.device_id()); |
- m->WriteWString(p.driver_version()); |
- m->WriteUInt32(p.pixel_shader_version()); |
- m->WriteUInt32(p.vertex_shader_version()); |
- m->WriteUInt32(p.gl_version()); |
- } |
- static bool Read(const Message* m, void** iter, param_type* p) { |
- uint32 vendor_id; |
- uint32 device_id; |
- std::wstring driver_version; |
- uint32 pixel_shader_version; |
- uint32 vertex_shader_version; |
- uint32 gl_version; |
- bool ret = m->ReadUInt32(iter, &vendor_id); |
- ret = ret && m->ReadUInt32(iter, &device_id); |
- ret = ret && m->ReadWString(iter, &driver_version); |
- ret = ret && m->ReadUInt32(iter, &pixel_shader_version); |
- ret = ret && m->ReadUInt32(iter, &vertex_shader_version); |
- ret = ret && m->ReadUInt32(iter, &gl_version); |
- p->SetGraphicsInfo(vendor_id, device_id, driver_version, |
- pixel_shader_version, vertex_shader_version, |
- gl_version); |
- return ret; |
- } |
- static void Log(const param_type& p, std::string* l) { |
- l->append(StringPrintf("<GPUInfo> %x %x %ls", |
- p.vendor_id(), p.device_id(), p.driver_version().c_str())); |
- } |
+ static void Write(Message* m, const param_type& p); |
+ static bool Read(const Message* m, void** iter, param_type* p); |
+ static void Log(const param_type& p, std::string* l); |
}; |
template <> |