Move cc ParamTraits to cc/ipc

cc/ipc/cc_param_traits.h

Index: cc/ipc/cc_param_traits.h
diff --git a/ui/gfx/ipc/geometry/gfx_param_traits.h b/cc/ipc/cc_param_traits.h
similarity index 59%
copy from ui/gfx/ipc/geometry/gfx_param_traits.h
copy to cc/ipc/cc_param_traits.h
index eda8790eb3703886673424928fde2f4fa3bfcd06..2902af421f65f594f149c8fe73ca4c451f859f3c 100644
--- a/ui/gfx/ipc/geometry/gfx_param_traits.h
+++ b/cc/ipc/cc_param_traits.h
@@ -1,34 +1,37 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
-
-#ifndef UI_GFX_IPC_GEOMETRY_GFX_PARAM_TRAITS_H_
-#define UI_GFX_IPC_GEOMETRY_GFX_PARAM_TRAITS_H_
-
-#include <string>
-
-#include "ipc/ipc_message_utils.h"
-#include "ipc/param_traits_macros.h"
-#include "ui/gfx/ipc/geometry/gfx_ipc_geometry_export.h"
+//
+// IPC Messages sent between compositor instances.
+
+#include "cc/ipc/cc_ipc_export.h"
+#include "cc/ipc/cc_param_traits_macros.h"
+#include "cc/output/compositor_frame.h"
+#include "cc/output/compositor_frame_ack.h"
+#include "cc/output/filter_operation.h"
+#include "cc/output/viewport_selection_bound.h"
+#include "cc/quads/draw_quad.h"
+#include "cc/quads/stream_video_draw_quad.h"
+#include "cc/quads/texture_draw_quad.h"
+#include "gpu/ipc/common/gpu_command_buffer_traits.h"
+#include "ipc/ipc_message_macros.h"
+
+#ifndef CC_IPC_CC_PARAM_TRAITS_H_

[Tom Sepez, 2016/05/13 23:57:39]

nit: curious as to why you moved the guard macros?

[Fady Samuel, 2016/05/14 00:06:47]

No good reason. The existing code was like this. Fixed.

+#define CC_IPC_CC_PARAM_TRAITS_H_
 
 namespace gfx {
-class Point;
-class PointF;
-class Point3F;
-class Rect;
-class RectF;
-class ScrollOffset;
-class Size;
-class SizeF;
-class Vector2d;
-class Vector2dF;
-}  // namespace gfx
+class Transform;
+}
+
+namespace cc {
+class FilterOperations;
+}
 
 namespace IPC {
 
 template <>
-struct GFX_IPC_GEOMETRY_EXPORT ParamTraits<gfx::Point> {
-  typedef gfx::Point param_type;
+struct ParamTraits<cc::FilterOperation> {
+  typedef cc::FilterOperation param_type;
   static void GetSize(base::PickleSizer* s, const param_type& p);
   static void Write(base::Pickle* m, const param_type& p);
   static bool Read(const base::Pickle* m,
@@ -38,8 +41,8 @@ struct GFX_IPC_GEOMETRY_EXPORT ParamTraits<gfx::Point> {
 };
 
 template <>
-struct GFX_IPC_GEOMETRY_EXPORT ParamTraits<gfx::PointF> {
-  typedef gfx::PointF param_type;
+struct ParamTraits<cc::FilterOperations> {
+  typedef cc::FilterOperations param_type;
   static void GetSize(base::PickleSizer* s, const param_type& p);
   static void Write(base::Pickle* m, const param_type& p);
   static bool Read(const base::Pickle* m,
@@ -49,8 +52,8 @@ struct GFX_IPC_GEOMETRY_EXPORT ParamTraits<gfx::PointF> {
 };
 
 template <>
-struct GFX_IPC_GEOMETRY_EXPORT ParamTraits<gfx::Point3F> {
-  typedef gfx::Point3F param_type;
+struct ParamTraits<sk_sp<SkImageFilter>> {
+  typedef sk_sp<SkImageFilter> param_type;
   static void GetSize(base::PickleSizer* s, const param_type& p);
   static void Write(base::Pickle* m, const param_type& p);
   static bool Read(const base::Pickle* m,
@@ -60,9 +63,8 @@ struct GFX_IPC_GEOMETRY_EXPORT ParamTraits<gfx::Point3F> {
 };
 
 template <>
-struct GFX_IPC_GEOMETRY_EXPORT ParamTraits<gfx::Size> {
-  typedef gfx::Size param_type;
-  static void GetSize(base::PickleSizer* s, const param_type& p);
+struct CC_IPC_EXPORT ParamTraits<cc::RenderPass> {
+  typedef cc::RenderPass param_type;
   static void Write(base::Pickle* m, const param_type& p);
   static bool Read(const base::Pickle* m,
                    base::PickleIterator* iter,
@@ -71,71 +73,68 @@ struct GFX_IPC_GEOMETRY_EXPORT ParamTraits<gfx::Size> {
 };
 
 template <>
-struct GFX_IPC_GEOMETRY_EXPORT ParamTraits<gfx::SizeF> {
-  typedef gfx::SizeF param_type;
-  static void GetSize(base::PickleSizer* s, const param_type& p);
+struct CC_IPC_EXPORT ParamTraits<cc::CompositorFrame> {
+  typedef cc::CompositorFrame 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);
+                   param_type* p);
   static void Log(const param_type& p, std::string* l);
 };
 
 template <>
-struct GFX_IPC_GEOMETRY_EXPORT ParamTraits<gfx::Vector2d> {
-  typedef gfx::Vector2d param_type;
-  static void GetSize(base::PickleSizer* s, const param_type& p);
+struct CC_IPC_EXPORT ParamTraits<cc::CompositorFrameAck> {
+  typedef cc::CompositorFrameAck 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);
+                   param_type* p);
   static void Log(const param_type& p, std::string* l);
 };
 
 template <>
-struct GFX_IPC_GEOMETRY_EXPORT ParamTraits<gfx::Vector2dF> {
-  typedef gfx::Vector2dF param_type;
-  static void GetSize(base::PickleSizer* s, const param_type& p);
+struct CC_IPC_EXPORT ParamTraits<cc::DelegatedFrameData> {
+  typedef cc::DelegatedFrameData 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);
+                   param_type* p);
   static void Log(const param_type& p, std::string* l);
 };
 
 template <>
-struct GFX_IPC_GEOMETRY_EXPORT ParamTraits<gfx::Rect> {
-  typedef gfx::Rect param_type;
+struct CC_IPC_EXPORT ParamTraits<cc::DrawQuad::Resources> {
+  typedef cc::DrawQuad::Resources param_type;
   static void GetSize(base::PickleSizer* s, const param_type& p);
   static void Write(base::Pickle* m, const param_type& p);
   static bool Read(const base::Pickle* m,
                    base::PickleIterator* iter,
-                   param_type* r);
+                   param_type* p);
   static void Log(const param_type& p, std::string* l);
 };
 
 template <>
-struct GFX_IPC_GEOMETRY_EXPORT ParamTraits<gfx::RectF> {
-  typedef gfx::RectF param_type;
+struct CC_IPC_EXPORT ParamTraits<cc::StreamVideoDrawQuad::OverlayResources> {
+  typedef cc::StreamVideoDrawQuad::OverlayResources param_type;
   static void GetSize(base::PickleSizer* s, const param_type& p);
   static void Write(base::Pickle* m, const param_type& p);
   static bool Read(const base::Pickle* m,
                    base::PickleIterator* iter,
-                   param_type* r);
+                   param_type* p);
   static void Log(const param_type& p, std::string* l);
 };
 
 template <>
-struct GFX_IPC_GEOMETRY_EXPORT ParamTraits<gfx::ScrollOffset> {
-  typedef gfx::ScrollOffset param_type;
+struct CC_IPC_EXPORT ParamTraits<cc::TextureDrawQuad::OverlayResources> {
+  typedef cc::TextureDrawQuad::OverlayResources param_type;
   static void GetSize(base::PickleSizer* s, const param_type& p);
   static void Write(base::Pickle* m, const param_type& p);
   static bool Read(const base::Pickle* m,
                    base::PickleIterator* iter,
-                   param_type* r);
+                   param_type* p);
   static void Log(const param_type& p, std::string* l);
 };
 
 }  // namespace IPC
 
-#endif  // UI_GFX_IPC_GEOMETRY_GFX_PARAM_TRAITS_H_
+#endif  // CC_IPC_CC_PARAM_TRAITS_H_