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 5fbf8859224d106b30569b3e07f4a2b7412f8a33..d9b0315294bd46d0f18dda77a3406fa998a3981f 100644 |
--- a/ui/gfx/ipc/gfx_param_traits.h |
+++ b/ui/gfx/ipc/gfx_param_traits.h |
@@ -12,121 +12,15 @@ |
#include "ui/gfx/buffer_types.h" |
#include "ui/gfx/ipc/gfx_ipc_export.h" |
#include "ui/gfx/ipc/gfx_param_traits_macros.h" |
+#include "ui/gfx/range/range.h" |
#if defined(OS_MACOSX) && !defined(OS_IOS) |
#include "ui/gfx/mac/io_surface.h" |
#endif |
-namespace gfx { |
-class Point; |
-class PointF; |
-class Point3F; |
-class Range; |
-class Rect; |
-class RectF; |
-class ScrollOffset; |
-class Size; |
-class SizeF; |
-class Vector2d; |
-class Vector2dF; |
-} // namespace gfx |
- |
namespace IPC { |
template <> |
-struct GFX_IPC_EXPORT ParamTraits<gfx::Point> { |
- typedef gfx::Point 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); |
-}; |
- |
-template <> |
-struct GFX_IPC_EXPORT ParamTraits<gfx::PointF> { |
- typedef gfx::PointF 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); |
- static void Log(const param_type& p, std::string* l); |
-}; |
- |
-template <> |
-struct GFX_IPC_EXPORT ParamTraits<gfx::Point3F> { |
- typedef gfx::Point3F 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); |
-}; |
- |
-template <> |
-struct GFX_IPC_EXPORT ParamTraits<gfx::Size> { |
- typedef gfx::Size 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); |
-}; |
- |
-template <> |
-struct GFX_IPC_EXPORT ParamTraits<gfx::SizeF> { |
- typedef gfx::SizeF 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); |
-}; |
- |
-template <> |
-struct GFX_IPC_EXPORT ParamTraits<gfx::Vector2d> { |
- typedef gfx::Vector2d 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); |
- static void Log(const param_type& p, std::string* l); |
-}; |
- |
-template <> |
-struct GFX_IPC_EXPORT ParamTraits<gfx::Vector2dF> { |
- typedef gfx::Vector2dF 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); |
-}; |
- |
-template <> |
-struct GFX_IPC_EXPORT ParamTraits<gfx::Rect> { |
- typedef gfx::Rect 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); |
-}; |
- |
-template <> |
-struct GFX_IPC_EXPORT ParamTraits<gfx::RectF> { |
- typedef gfx::RectF 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); |
- 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); |
@@ -136,16 +30,6 @@ struct GFX_IPC_EXPORT ParamTraits<gfx::Range> { |
static void Log(const param_type& p, std::string* l); |
}; |
-template <> |
-struct GFX_IPC_EXPORT ParamTraits<gfx::ScrollOffset> { |
- typedef gfx::ScrollOffset 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> { |