Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1931)

Unified Diff: content/common/cc_messages.h

Issue 1149113006: Move Pickle to base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/android/gin_java_bridge_value.h ('k') | content/common/content_param_traits.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/cc_messages.h
diff --git a/content/common/cc_messages.h b/content/common/cc_messages.h
index 1df0ac05c366cebbc02298f01b780c330e14630e..02060449d59473cdbad301c6c2d4d0dba7bd5f5f 100644
--- a/content/common/cc_messages.h
+++ b/content/common/cc_messages.h
@@ -50,7 +50,7 @@ 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, PickleIterator* iter, param_type* r);
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* r);
static void Log(const param_type& p, std::string* l);
};
@@ -58,7 +58,7 @@ 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, PickleIterator* iter, param_type* r);
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* r);
static void Log(const param_type& p, std::string* l);
};
@@ -66,7 +66,7 @@ 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, PickleIterator* iter, param_type* r);
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* r);
static void Log(const param_type& p, std::string* l);
};
@@ -74,7 +74,7 @@ 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, PickleIterator* iter, param_type* r);
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* r);
static void Log(const param_type& p, std::string* l);
};
@@ -82,7 +82,7 @@ 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, PickleIterator* iter, param_type* r);
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* r);
static void Log(const param_type& p, std::string* l);
};
@@ -90,7 +90,7 @@ 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, PickleIterator* iter, param_type* p);
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* p);
static void Log(const param_type& p, std::string* l);
};
@@ -98,7 +98,7 @@ 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, PickleIterator* iter, param_type* p);
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* p);
static void Log(const param_type& p, std::string* l);
};
@@ -106,7 +106,7 @@ 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, PickleIterator* iter, param_type* p);
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* p);
static void Log(const param_type& p, std::string* l);
};
@@ -114,7 +114,7 @@ template <>
struct CONTENT_EXPORT ParamTraits<cc::SoftwareFrameData> {
typedef cc::SoftwareFrameData param_type;
static void Write(Message* m, const param_type& p);
- static bool Read(const Message* m, PickleIterator* iter, param_type* p);
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* p);
static void Log(const param_type& p, std::string* l);
};
« no previous file with comments | « content/common/android/gin_java_bridge_value.h ('k') | content/common/content_param_traits.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698