Move GPU messages to content. I've also switched the IPC structs to use the ...

chrome/common/gpu_messages.cc

Index: chrome/common/gpu_messages.cc
===================================================================
--- chrome/common/gpu_messages.cc	(revision 77652)
+++ chrome/common/gpu_messages.cc	(working copy)
@@ -1,249 +0,0 @@
-// 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 "ipc/ipc_channel_handle.h"
-#include "ui/gfx/rect.h"
-#include "ui/gfx/size.h"
-
-#define IPC_MESSAGE_IMPL
-#include "chrome/common/gpu_messages.h"
-
-#if defined(OS_MACOSX)
-
-// Parameters for the GpuHostMsg_AcceleratedSurfaceSetIOSurface
-// message, which has too many parameters to be sent with the
-// predefined IPC macros.
-GpuHostMsg_AcceleratedSurfaceSetIOSurface_Params::
-    GpuHostMsg_AcceleratedSurfaceSetIOSurface_Params()
-        : renderer_id(0),
-          render_view_id(0),
-          window(NULL),
-          width(0),
-          height(0),
-          identifier(0) {
-}
-
-GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params::
-    GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params()
-        : renderer_id(0),
-          render_view_id(0),
-          window(NULL),
-          surface_id(0),
-          route_id(0),
-          swap_buffers_count(0) {
-}
-#endif
-
-namespace IPC {
-
-#if defined(OS_MACOSX)
-
-void ParamTraits<GpuHostMsg_AcceleratedSurfaceSetIOSurface_Params> ::Write(
-    Message* m,
-    const param_type& p) {
-  WriteParam(m, p.renderer_id);
-  WriteParam(m, p.render_view_id);
-  WriteParam(m, p.window);
-  WriteParam(m, p.width);
-  WriteParam(m, p.height);
-  WriteParam(m, p.identifier);
-}
-
-bool ParamTraits<GpuHostMsg_AcceleratedSurfaceSetIOSurface_Params> ::Read(
-    const Message* m,
-    void** iter,
-    param_type* p) {
-  return ReadParam(m, iter, &p->renderer_id) &&
-      ReadParam(m, iter, &p->render_view_id) &&
-      ReadParam(m, iter, &p->window) &&
-      ReadParam(m, iter, &p->width) &&
-      ReadParam(m, iter, &p->height) &&
-      ReadParam(m, iter, &p->identifier);
-}
-
-void ParamTraits<GpuHostMsg_AcceleratedSurfaceSetIOSurface_Params> ::Log(
-     const param_type& p,
-     std::string* l) {
-  l->append("(");
-  LogParam(p.renderer_id, l);
-  l->append(", ");
-  LogParam(p.render_view_id, l);
-  l->append(", ");
-  LogParam(p.window, l);
-  l->append(", ");
-  LogParam(p.width, l);
-  l->append(", ");
-  LogParam(p.height, l);
-  l->append(", ");
-  LogParam(p.identifier, l);
-  l->append(")");
-}
-
-void ParamTraits<GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params> ::Write(
-    Message* m,
-    const param_type& p) {
-  WriteParam(m, p.renderer_id);
-  WriteParam(m, p.render_view_id);
-  WriteParam(m, p.window);
-  WriteParam(m, p.surface_id);
-  WriteParam(m, p.route_id);
-  WriteParam(m, p.swap_buffers_count);
-}
-
-bool ParamTraits<GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params> ::Read(
-    const Message* m,
-    void** iter,
-    param_type* p) {
-  return ReadParam(m, iter, &p->renderer_id) &&
-      ReadParam(m, iter, &p->render_view_id) &&
-      ReadParam(m, iter, &p->window) &&
-      ReadParam(m, iter, &p->surface_id) &&
-      ReadParam(m, iter, &p->route_id) &&
-      ReadParam(m, iter, &p->swap_buffers_count);
-}
-
-void ParamTraits<GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params> ::Log(
-     const param_type& p,
-     std::string* l) {
-  l->append("(");
-  LogParam(p.renderer_id, l);
-  l->append(", ");
-  LogParam(p.render_view_id, l);
-  l->append(", ");
-  LogParam(p.window, l);
-  l->append(", ");
-  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, 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.driver_date);
-  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);
-  WriteParam(m, p.collection_error);
-
-#if defined(OS_WIN)
-  ParamTraits<DxDiagNode> ::Write(m, p.dx_diagnostics);
-#endif
-}
-
-bool ParamTraits<GPUInfo> ::Read(const Message* m, void** iter, param_type* p) {
-  return
-      ReadParam(m, iter, &p->level) &&
-      ReadParam(m, iter, &p->initialization_time) &&
-      ReadParam(m, iter, &p->vendor_id) &&
-      ReadParam(m, iter, &p->device_id) &&
-      ReadParam(m, iter, &p->driver_vendor) &&
-      ReadParam(m, iter, &p->driver_version) &&
-      ReadParam(m, iter, &p->driver_date) &&
-      ReadParam(m, iter, &p->pixel_shader_version) &&
-      ReadParam(m, iter, &p->vertex_shader_version) &&
-      ReadParam(m, iter, &p->gl_version) &&
-      ReadParam(m, iter, &p->gl_version_string) &&
-      ReadParam(m, iter, &p->gl_vendor) &&
-      ReadParam(m, iter, &p->gl_renderer) &&
-      ReadParam(m, iter, &p->gl_extensions) &&
-      ReadParam(m, iter, &p->can_lose_context) &&
-      ReadParam(m, iter, &p->collection_error) &&
-#if defined(OS_WIN)
-      ReadParam(m, iter, &p->dx_diagnostics);
-#else
-      true;
-#endif
-}
-
-void ParamTraits<GPUInfo> ::Log(const param_type& p, std::string* l) {
-  l->append(base::StringPrintf("<GPUInfo> %d %d %x %x %s %s %s %x %x %x %d",
-                               p.level,
-                               static_cast<int32>(
-                                   p.initialization_time.InMilliseconds()),
-                               p.vendor_id,
-                               p.device_id,
-                               p.driver_vendor.c_str(),
-                               p.driver_version.c_str(),
-                               p.driver_date.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);
-  return ret;
-}
-
-void ParamTraits<DxDiagNode> ::Log(const param_type& p, std::string* l) {
-  l->append("<DxDiagNode>");
-}
-
-void ParamTraits<GPUCreateCommandBufferConfig> ::Write(
-    Message* m, const param_type& p) {
-  WriteParam(m, p.allowed_extensions);
-  WriteParam(m, p.attribs);
-}
-
-bool ParamTraits<GPUCreateCommandBufferConfig> ::Read(
-    const Message* m, void** iter, param_type* p) {
-  if (!ReadParam(m, iter, &p->allowed_extensions) ||
-      !ReadParam(m, iter, &p->attribs)) {
-    return false;
-  }
-  return true;
-}
-
-void ParamTraits<GPUCreateCommandBufferConfig> ::Log(
-    const param_type& p, std::string* l) {
-  l->append("<GPUCreateCommandBufferConfig>");
-}
-
-}  // namespace IPC