Index: ui/gfx/ipc/geometry/gfx_param_traits.h |
diff --git a/ui/gfx/ipc/gfx_param_traits.h b/ui/gfx/ipc/geometry/gfx_param_traits.h |
similarity index 64% |
copy from ui/gfx/ipc/gfx_param_traits.h |
copy to ui/gfx/ipc/geometry/gfx_param_traits.h |
index 5fbf8859224d106b30569b3e07f4a2b7412f8a33..500048e6c77703a2ef85ce6ed65f0264c0410816 100644 |
--- a/ui/gfx/ipc/gfx_param_traits.h |
+++ b/ui/gfx/ipc/geometry/gfx_param_traits.h |
@@ -2,26 +2,19 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef UI_GFX_IPC_GFX_PARAM_TRAITS_H_ |
-#define UI_GFX_IPC_GFX_PARAM_TRAITS_H_ |
+#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/buffer_types.h" |
-#include "ui/gfx/ipc/gfx_ipc_export.h" |
-#include "ui/gfx/ipc/gfx_param_traits_macros.h" |
- |
-#if defined(OS_MACOSX) && !defined(OS_IOS) |
-#include "ui/gfx/mac/io_surface.h" |
-#endif |
+#include "ui/gfx/ipc/geometry/gfx_ipc_geometry_export.h" |
namespace gfx { |
class Point; |
class PointF; |
class Point3F; |
-class Range; |
class Rect; |
class RectF; |
class ScrollOffset; |
@@ -34,7 +27,7 @@ class Vector2dF; |
namespace IPC { |
template <> |
-struct GFX_IPC_EXPORT ParamTraits<gfx::Point> { |
+struct GFX_IPC_GEOMETRY_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, |
@@ -44,7 +37,7 @@ struct GFX_IPC_EXPORT ParamTraits<gfx::Point> { |
}; |
template <> |
-struct GFX_IPC_EXPORT ParamTraits<gfx::PointF> { |
+struct GFX_IPC_GEOMETRY_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); |
@@ -55,7 +48,7 @@ struct GFX_IPC_EXPORT ParamTraits<gfx::PointF> { |
}; |
template <> |
-struct GFX_IPC_EXPORT ParamTraits<gfx::Point3F> { |
+struct GFX_IPC_GEOMETRY_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, |
@@ -65,7 +58,7 @@ struct GFX_IPC_EXPORT ParamTraits<gfx::Point3F> { |
}; |
template <> |
-struct GFX_IPC_EXPORT ParamTraits<gfx::Size> { |
+struct GFX_IPC_GEOMETRY_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, |
@@ -75,7 +68,7 @@ struct GFX_IPC_EXPORT ParamTraits<gfx::Size> { |
}; |
template <> |
-struct GFX_IPC_EXPORT ParamTraits<gfx::SizeF> { |
+struct GFX_IPC_GEOMETRY_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, |
@@ -85,7 +78,7 @@ struct GFX_IPC_EXPORT ParamTraits<gfx::SizeF> { |
}; |
template <> |
-struct GFX_IPC_EXPORT ParamTraits<gfx::Vector2d> { |
+struct GFX_IPC_GEOMETRY_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); |
@@ -96,7 +89,7 @@ struct GFX_IPC_EXPORT ParamTraits<gfx::Vector2d> { |
}; |
template <> |
-struct GFX_IPC_EXPORT ParamTraits<gfx::Vector2dF> { |
+struct GFX_IPC_GEOMETRY_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, |
@@ -106,7 +99,7 @@ struct GFX_IPC_EXPORT ParamTraits<gfx::Vector2dF> { |
}; |
template <> |
-struct GFX_IPC_EXPORT ParamTraits<gfx::Rect> { |
+struct GFX_IPC_GEOMETRY_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, |
@@ -116,7 +109,7 @@ struct GFX_IPC_EXPORT ParamTraits<gfx::Rect> { |
}; |
template <> |
-struct GFX_IPC_EXPORT ParamTraits<gfx::RectF> { |
+struct GFX_IPC_GEOMETRY_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); |
@@ -127,17 +120,7 @@ struct GFX_IPC_EXPORT ParamTraits<gfx::RectF> { |
}; |
template <> |
-struct GFX_IPC_EXPORT ParamTraits<gfx::Range> { |
- typedef gfx::Range 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::ScrollOffset> { |
+struct GFX_IPC_GEOMETRY_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, |
@@ -146,22 +129,6 @@ struct GFX_IPC_EXPORT ParamTraits<gfx::ScrollOffset> { |
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> { |
- typedef gfx::ScopedRefCountedIOSurfaceMachPort param_type; |
- static void Write(base::Pickle* m, const param_type p); |
- // Note: Read() passes ownership of the Mach send right from the IPC message |
- // to the ScopedRefCountedIOSurfaceMachPort. Therefore, Read() may only be |
- // called once for a given message, otherwise the singular right will be |
- // managed and released by two objects. |
- static bool Read(const base::Pickle* m, |
- base::PickleIterator* iter, |
- param_type* r); |
- static void Log(const param_type& p, std::string* l); |
-}; |
-#endif // defined(OS_MACOSX) && !defined(OS_IOS) |
- |
} // namespace IPC |
-#endif // UI_GFX_IPC_GFX_PARAM_TRAITS_H_ |
+#endif // UI_GFX_IPC_GEOMETRY_GFX_PARAM_TRAITS_H_ |