| Index: ppapi/proxy/ppapi_param_traits.h
|
| diff --git a/ppapi/proxy/ppapi_param_traits.h b/ppapi/proxy/ppapi_param_traits.h
|
| index 63121f0dd384cff6c4df39614e73096723b90df1..40e4e5bd0b1421a5bef1745fdba78150cee974eb 100644
|
| --- a/ppapi/proxy/ppapi_param_traits.h
|
| +++ b/ppapi/proxy/ppapi_param_traits.h
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -42,7 +42,7 @@ template<>
|
| struct ParamTraits<PP_Bool> {
|
| typedef PP_Bool param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, void** iter, param_type* r);
|
| + static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -50,7 +50,7 @@ template<>
|
| struct ParamTraits<PP_FileInfo> {
|
| typedef PP_FileInfo param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, void** iter, param_type* r);
|
| + static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -58,7 +58,7 @@ template <>
|
| struct PPAPI_PROXY_EXPORT ParamTraits<PP_NetAddress_Private> {
|
| typedef PP_NetAddress_Private param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, void** iter, param_type* p);
|
| + static bool Read(const Message* m, PickleIterator* iter, param_type* p);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -66,7 +66,7 @@ template<>
|
| struct ParamTraits<PP_ObjectProperty> {
|
| typedef PP_ObjectProperty param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, void** iter, param_type* r);
|
| + static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -74,7 +74,7 @@ template<>
|
| struct ParamTraits<ppapi::proxy::PPBFlash_DrawGlyphs_Params> {
|
| typedef ppapi::proxy::PPBFlash_DrawGlyphs_Params param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, void** iter, param_type* r);
|
| + static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -82,7 +82,7 @@ template<>
|
| struct ParamTraits<ppapi::PPB_FileRef_CreateInfo> {
|
| typedef ppapi::PPB_FileRef_CreateInfo param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, void** iter, param_type* r);
|
| + static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -90,7 +90,7 @@ template<>
|
| struct ParamTraits<ppapi::proxy::PPBURLLoader_UpdateProgress_Params> {
|
| typedef ppapi::proxy::PPBURLLoader_UpdateProgress_Params param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, void** iter, param_type* r);
|
| + static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -98,7 +98,7 @@ template<>
|
| struct ParamTraits<ppapi::proxy::SerializedDirEntry> {
|
| typedef ppapi::proxy::SerializedDirEntry param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, void** iter, param_type* r);
|
| + static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -106,7 +106,7 @@ template<>
|
| struct ParamTraits<ppapi::proxy::SerializedFontDescription> {
|
| typedef ppapi::proxy::SerializedFontDescription param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, void** iter, param_type* r);
|
| + static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -114,7 +114,7 @@ template<>
|
| struct ParamTraits<ppapi::HostResource> {
|
| typedef ppapi::HostResource param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, void** iter, param_type* r);
|
| + static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -122,7 +122,7 @@ template<>
|
| struct ParamTraits<ppapi::proxy::SerializedVar> {
|
| typedef ppapi::proxy::SerializedVar param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, void** iter, param_type* r);
|
| + static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -130,7 +130,7 @@ template<>
|
| struct ParamTraits< std::vector<ppapi::proxy::SerializedVar> > {
|
| typedef std::vector<ppapi::proxy::SerializedVar> param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, void** iter, param_type* r);
|
| + static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -138,7 +138,7 @@ template<>
|
| struct ParamTraits< std::vector<ppapi::PPB_FileRef_CreateInfo> > {
|
| typedef std::vector<ppapi::PPB_FileRef_CreateInfo> param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, void** iter, param_type* r);
|
| + static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
| @@ -146,7 +146,7 @@ template<>
|
| struct ParamTraits<ppapi::proxy::SerializedFlashMenu> {
|
| typedef ppapi::proxy::SerializedFlashMenu param_type;
|
| static void Write(Message* m, const param_type& p);
|
| - static bool Read(const Message* m, void** iter, param_type* r);
|
| + static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| static void Log(const param_type& p, std::string* l);
|
| };
|
|
|
|
|