Index: content/common/cc_messages.h |
diff --git a/content/common/cc_messages.h b/content/common/cc_messages.h |
index 9f2e84ece39258b11e2d4447ef0a55604a8da714..e7358e6d439c7bc78de3993934db26ff9cea0da5 100644 |
--- a/content/common/cc_messages.h |
+++ b/content/common/cc_messages.h |
@@ -48,88 +48,110 @@ namespace IPC { |
template <> |
struct ParamTraits<cc::FilterOperation> { |
typedef cc::FilterOperation param_type; |
- static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, base::PickleIterator* iter, param_type* r); |
+ 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 ParamTraits<cc::FilterOperations> { |
typedef cc::FilterOperations param_type; |
- static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, base::PickleIterator* iter, param_type* r); |
+ 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 ParamTraits<skia::RefPtr<SkImageFilter> > { |
typedef skia::RefPtr<SkImageFilter> param_type; |
- static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, base::PickleIterator* iter, param_type* r); |
+ 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 ParamTraits<gfx::Transform> { |
typedef gfx::Transform param_type; |
- static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, base::PickleIterator* iter, param_type* r); |
+ 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 CONTENT_EXPORT ParamTraits<cc::RenderPass> { |
typedef cc::RenderPass param_type; |
- static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, base::PickleIterator* iter, param_type* r); |
+ 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 CONTENT_EXPORT ParamTraits<cc::CompositorFrame> { |
typedef cc::CompositorFrame param_type; |
- static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, base::PickleIterator* iter, 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* p); |
static void Log(const param_type& p, std::string* l); |
}; |
template<> |
struct CONTENT_EXPORT ParamTraits<cc::CompositorFrameAck> { |
typedef cc::CompositorFrameAck param_type; |
- static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, base::PickleIterator* iter, 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* p); |
static void Log(const param_type& p, std::string* l); |
}; |
template<> |
struct CONTENT_EXPORT ParamTraits<cc::DelegatedFrameData> { |
typedef cc::DelegatedFrameData param_type; |
- static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, base::PickleIterator* iter, 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* p); |
static void Log(const param_type& p, std::string* l); |
}; |
template <> |
struct CONTENT_EXPORT ParamTraits<cc::DrawQuad::Resources> { |
typedef cc::DrawQuad::Resources param_type; |
- static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, base::PickleIterator* iter, 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* p); |
static void Log(const param_type& p, std::string* l); |
}; |
template <> |
struct CONTENT_EXPORT ParamTraits<cc::StreamVideoDrawQuad::OverlayResources> { |
typedef cc::StreamVideoDrawQuad::OverlayResources param_type; |
- static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, base::PickleIterator* iter, 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* p); |
static void Log(const param_type& p, std::string* l); |
}; |
template <> |
struct CONTENT_EXPORT ParamTraits<cc::TextureDrawQuad::OverlayResources> { |
typedef cc::TextureDrawQuad::OverlayResources param_type; |
- static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, base::PickleIterator* iter, 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* p); |
static void Log(const param_type& p, std::string* l); |
}; |