diff options
author | brettw <brettw@chromium.org> | 2015-06-02 00:02:47 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-02 07:03:21 +0000 |
commit | 05cfd8ddb3849b7e11bb53e199064291a52aeea9 (patch) | |
tree | c197bfdf337bee3b804219251c43e4323ae9a6ae /gpu | |
parent | 7f9715680150b2f0c3ae46a227075859c73042b2 (diff) | |
download | chromium_src-05cfd8ddb3849b7e11bb53e199064291a52aeea9.zip chromium_src-05cfd8ddb3849b7e11bb53e199064291a52aeea9.tar.gz chromium_src-05cfd8ddb3849b7e11bb53e199064291a52aeea9.tar.bz2 |
Move Pickle to base namespace.
Updates forward-declares and headers, but keeps a using statement in to avoid updating all users atomically.
TBR=jschuh for IPC stuff
Review URL: https://codereview.chromium.org/1149113006
Cr-Commit-Position: refs/heads/master@{#332352}
Diffstat (limited to 'gpu')
-rw-r--r-- | gpu/ipc/gpu_command_buffer_traits.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gpu/ipc/gpu_command_buffer_traits.h b/gpu/ipc/gpu_command_buffer_traits.h index 1c7e02e..d99d465 100644 --- a/gpu/ipc/gpu_command_buffer_traits.h +++ b/gpu/ipc/gpu_command_buffer_traits.h @@ -22,7 +22,7 @@ template <> struct GPU_EXPORT ParamTraits<gpu::CommandBuffer::State> { typedef gpu::CommandBuffer::State 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); }; @@ -30,7 +30,7 @@ template<> struct GPU_EXPORT ParamTraits<gpu::Mailbox> { typedef gpu::Mailbox 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); }; @@ -38,7 +38,7 @@ template <> struct GPU_EXPORT ParamTraits<gpu::MailboxHolder> { typedef gpu::MailboxHolder 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); }; @@ -46,7 +46,7 @@ template <> struct GPU_EXPORT ParamTraits<gpu::ValueState> { typedef gpu::ValueState 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); }; |