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

chrome/common/common_param_traits.h

 // Copyright (c) 2011 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.
 
 // This file is used to define IPC::ParamTraits<> specializations for a number
 // of types so that they can be serialized over IPC.  IPC::ParamTraits<>
 // specializations for basic types (like int and std::string) and types in the
 // 'base' project can be found in ipc/ipc_message_utils.h.  This file contains
 // specializations for types that are shared by more than one child process.
 
 #ifndef CHROME_COMMON_COMMON_PARAM_TRAITS_H_
 #define CHROME_COMMON_COMMON_PARAM_TRAITS_H_
 #pragma once
 
 #include "app/surface/transport_dib.h"
 #include "base/file_util.h"
 #include "base/ref_counted.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/page_zoom.h"
 #include "ipc/ipc_message_utils.h"
 #include "printing/native_metafile.h"
 // !!! WARNING: DO NOT ADD NEW WEBKIT DEPENDENCIES !!!
 //
 // That means don't add #includes to any file in 'webkit/' or
 // 'third_party/WebKit/'. Chrome Frame and NACL build parts of base/ and
 // chrome/common/ for a mini-library that doesn't depend on webkit.
 //
 // TODO(erg): The following headers are historical and only work because
 // their definitions are inlined, which also needs to be fixed.
-#include "ui/gfx/native_widget_types.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/window_open_disposition.h"
 
 // Forward declarations.
 struct Geoposition;
 class SkBitmap;
 class DictionaryValue;
 class ListValue;
 struct ThumbnailScore;
 struct WebApplicationInfo;
 class WebCursor;
 
-namespace gfx {
-class Point;
-class Rect;
-class Size;
-}  // namespace gfx
-
 namespace printing {
 struct PageRange;
 struct PrinterCapsAndDefaults;
 }  // namespace printing
 
 namespace webkit_glue {
 struct PasswordForm;
 }  // namespace webkit_glue
 
 namespace IPC {
 
 template <>
 struct ParamTraits<SkBitmap> {
   typedef SkBitmap param_type;
   static void Write(Message* m, const param_type& p);
 
   // Note: This function expects parameter |r| to be of type &SkBitmap since
   // r->SetConfig() and r->SetPixels() are called.
   static bool Read(const Message* m, void** iter, param_type* r);
 
   static void Log(const param_type& p, std::string* l);
 };
 
 template <>
-struct ParamTraits<gfx::Point> {
-  typedef gfx::Point param_type;
-  static void Write(Message* m, const param_type& p);
-  static bool Read(const Message* m, void** iter, param_type* r);
-  static void Log(const param_type& p, std::string* l);
-};
-
-template <>
-struct ParamTraits<gfx::Rect> {
-  typedef gfx::Rect param_type;
-  static void Write(Message* m, const param_type& p);
-  static bool Read(const Message* m, void** iter, param_type* r);
-  static void Log(const param_type& p, std::string* l);
-};
-
-template <>
-struct ParamTraits<gfx::Size> {
-  typedef gfx::Size param_type;
-  static void Write(Message* m, const param_type& p);
-  static bool Read(const Message* m, void** iter, param_type* r);
-  static void Log(const param_type& p, std::string* l);
-};
-
-template <>
 struct ParamTraits<ContentSetting> {
   typedef ContentSetting param_type;
   static void Write(Message* m, const param_type& p);
   static bool Read(const Message* m, void** iter, param_type* r);
   static void Log(const param_type& p, std::string* l);
 };
 
 template <>
 struct ParamTraits<ContentSettingsType> {
   typedef ContentSettingsType param_type;
@@ skipping 16 matching lines @@
 
 template <>
 struct ParamTraits<ContentSettings> {
   typedef ContentSettings param_type;
   static void Write(Message* m, const param_type& p);
   static bool Read(const Message* m, void** iter, param_type* r);
   static void Log(const param_type& p, std::string* l);
 };
 
 template <>
-struct ParamTraits<gfx::NativeWindow> {
-  typedef gfx::NativeWindow param_type;
-  static void Write(Message* m, const param_type& p) {
-#if defined(OS_WIN)
-    // HWNDs are always 32 bits on Windows, even on 64 bit systems.
-    m->WriteUInt32(reinterpret_cast<uint32>(p));
-#else
-    m->WriteData(reinterpret_cast<const char*>(&p), sizeof(p));
-#endif
-  }
-  static bool Read(const Message* m, void** iter, param_type* r) {
-#if defined(OS_WIN)
-    return m->ReadUInt32(iter, reinterpret_cast<uint32*>(r));
-#else
-    const char *data;
-    int data_size = 0;
-    bool result = m->ReadData(iter, &data, &data_size);
-    if (result && data_size == sizeof(gfx::NativeWindow)) {
-      memcpy(r, data, sizeof(gfx::NativeWindow));
-    } else {
-      result = false;
-      NOTREACHED();
-    }
-    return result;
-#endif
-  }
-  static void Log(const param_type& p, std::string* l) {
-    l->append("<gfx::NativeWindow>");
-  }
-};
-
-template <>
 struct ParamTraits<PageZoom::Function> {
   typedef PageZoom::Function param_type;
   static void Write(Message* m, const param_type& p) {
     WriteParam(m, static_cast<int>(p));
   }
   static bool Read(const Message* m, void** iter, param_type* r) {
     int value;
     if (!ReadParam(m, iter, &value))
       return false;
     *r = static_cast<param_type>(value);
@@ skipping 114 matching lines @@
 struct ParamTraits<printing::PrinterCapsAndDefaults> {
   typedef printing::PrinterCapsAndDefaults param_type;
   static void Write(Message* m, const param_type& p);
   static bool Read(const Message* m, void** iter, param_type* r);
   static void Log(const param_type& p, std::string* l);
 };
 
 }  // namespace IPC
 
 #endif  // CHROME_COMMON_COMMON_PARAM_TRAITS_H_