| Index: ppapi/proxy/ppapi_param_traits.cc
|
| diff --git a/ppapi/proxy/ppapi_param_traits.cc b/ppapi/proxy/ppapi_param_traits.cc
|
| index acd1fdd4ea6e1c4c5fc9c6e344c3e8727a84c995..4317400ce73308d29dcfdd3c3150c4802788363c 100644
|
| --- a/ppapi/proxy/ppapi_param_traits.cc
|
| +++ b/ppapi/proxy/ppapi_param_traits.cc
|
| @@ -8,7 +8,7 @@
|
|
|
| #include "ppapi/c/pp_file_info.h"
|
| #include "ppapi/c/pp_resource.h"
|
| -#include "ppapi/c/private/ppb_flash_tcp_socket.h"
|
| +#include "ppapi/c/private/ppb_tcp_socket.h"
|
| #include "ppapi/proxy/ppapi_messages.h"
|
| #include "ppapi/proxy/serialized_var.h"
|
| #include "ppapi/proxy/serialized_flash_menu.h"
|
| @@ -136,18 +136,18 @@ bool ParamTraits<PP_FileInfo>::Read(const Message* m, void** iter,
|
| void ParamTraits<PP_FileInfo>::Log(const param_type& p, std::string* l) {
|
| }
|
|
|
| -// PP_Flash_NetAddress ---------------------------------------------------------
|
| +// PP_NetAddress ---------------------------------------------------------
|
|
|
| // static
|
| -void ParamTraits<PP_Flash_NetAddress>::Write(Message* m, const param_type& p) {
|
| +void ParamTraits<PP_NetAddress>::Write(Message* m, const param_type& p) {
|
| WriteParam(m, p.size);
|
| m->WriteBytes(p.data, static_cast<int>(p.size));
|
| }
|
|
|
| // static
|
| -bool ParamTraits<PP_Flash_NetAddress>::Read(const Message* m,
|
| - void** iter,
|
| - param_type* p) {
|
| +bool ParamTraits<PP_NetAddress>::Read(const Message* m,
|
| + void** iter,
|
| + param_type* p) {
|
| uint16 size;
|
| if (!ReadParam(m, iter, &size))
|
| return false;
|
| @@ -163,13 +163,36 @@ bool ParamTraits<PP_Flash_NetAddress>::Read(const Message* m,
|
| }
|
|
|
| // static
|
| -void ParamTraits<PP_Flash_NetAddress>::Log(const param_type& p,
|
| - std::string* l) {
|
| - l->append("<PP_Flash_NetAddress (");
|
| +void ParamTraits<PP_NetAddress>::Log(const param_type& p,
|
| + std::string* l) {
|
| + l->append("<PP_NetAddress (");
|
| LogParam(p.size, l);
|
| l->append(" bytes)>");
|
| }
|
|
|
| +// PP_Flash_NetAddress ---------------------------------------------------------
|
| +
|
| +// static
|
| +void ParamTraits<PP_Flash_NetAddress>::Write(Message* m, const param_type& p) {
|
| + ParamTraits<PP_NetAddress>::Write(m,
|
| + reinterpret_cast<const ParamTraits<PP_NetAddress>::param_type&>(p));
|
| +}
|
| +
|
| +// static
|
| +bool ParamTraits<PP_Flash_NetAddress>::Read(const Message* m,
|
| + void** iter,
|
| + param_type* p) {
|
| + return ParamTraits<PP_NetAddress>::Read(m, iter,
|
| + reinterpret_cast<ParamTraits<PP_NetAddress>::param_type*>(p));
|
| +}
|
| +
|
| +// static
|
| +void ParamTraits<PP_Flash_NetAddress>::Log(const param_type& p,
|
| + std::string* l) {
|
| + ParamTraits<PP_NetAddress>::Log(
|
| + reinterpret_cast<const ParamTraits<PP_NetAddress>::param_type&>(p), l);
|
| +}
|
| +
|
| // PP_ObjectProperty -----------------------------------------------------------
|
|
|
| // static
|
|
|