Separate gfx_ipc into skia-dependent and non-skia-dependent parts

ui/gfx/ipc/gfx_param_traits.h

Index: ui/gfx/ipc/gfx_param_traits.h
diff --git a/ui/gfx/ipc/gfx_param_traits.h b/ui/gfx/ipc/gfx_param_traits.h
index 17b501fa28664c83fc8cde7454a4643339375c14..5fbf8859224d106b30569b3e07f4a2b7412f8a33 100644
--- a/ui/gfx/ipc/gfx_param_traits.h
+++ b/ui/gfx/ipc/gfx_param_traits.h
@@ -17,8 +17,6 @@
 #include "ui/gfx/mac/io_surface.h"
 #endif
 
-class SkBitmap;
-
 namespace gfx {
 class Point;
 class PointF;
@@ -29,7 +27,6 @@ class RectF;
 class ScrollOffset;
 class Size;
 class SizeF;
-class Transform;
 class Vector2d;
 class Vector2dF;
 }  // namespace gfx
@@ -130,20 +127,6 @@ struct GFX_IPC_EXPORT ParamTraits<gfx::RectF> {
 };
 
 template <>
-struct GFX_IPC_EXPORT ParamTraits<SkBitmap> {
-  typedef SkBitmap param_type;
-  static void Write(base::Pickle* 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 base::Pickle* m,
-                   base::PickleIterator* iter,
-                   param_type* r);
-
-  static void Log(const param_type& p, std::string* l);
-};
-
-template <>
 struct GFX_IPC_EXPORT ParamTraits<gfx::Range> {
   typedef gfx::Range param_type;
   static void Write(base::Pickle* m, const param_type& p);
@@ -163,16 +146,6 @@ struct GFX_IPC_EXPORT ParamTraits<gfx::ScrollOffset> {
   static void Log(const param_type& p, std::string* l);
 };
 
-template <>
-struct GFX_IPC_EXPORT ParamTraits<gfx::Transform> {
-  typedef gfx::Transform param_type;
-  static void Write(base::Pickle* m, const param_type& p);
-  static bool Read(const base::Pickle* m,
-                   base::PickleIterator* iter,
-                   param_type* r);
-  static void Log(const param_type& p, std::string* l);
-};
-
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 template <>
 struct GFX_IPC_EXPORT ParamTraits<gfx::ScopedRefCountedIOSurfaceMachPort> {