Index: ppapi/proxy/ppapi_param_traits.cc |
diff --git a/ppapi/proxy/ppapi_param_traits.cc b/ppapi/proxy/ppapi_param_traits.cc |
index d8f6b70d8496298245f8443a23d8f1b6fd60d0c9..0e3c6de0c27ce80eae7f2d523d20575f6e0f5246 100644 |
--- a/ppapi/proxy/ppapi_param_traits.cc |
+++ b/ppapi/proxy/ppapi_param_traits.cc |
@@ -193,12 +193,12 @@ void ParamTraits<PP_ObjectProperty>::Log(const param_type& p, std::string* l) { |
// PPBFlash_DrawGlyphs_Params -------------------------------------------------- |
// static |
-void ParamTraits<pp::proxy::PPBFlash_DrawGlyphs_Params>::Write( |
+void ParamTraits<ppapi::proxy::PPBFlash_DrawGlyphs_Params>::Write( |
Message* m, |
const param_type& p) { |
ParamTraits<PP_Instance>::Write(m, p.instance); |
ParamTraits<ppapi::HostResource>::Write(m, p.image_data); |
- ParamTraits<pp::proxy::SerializedFontDescription>::Write(m, p.font_desc); |
+ ParamTraits<ppapi::proxy::SerializedFontDescription>::Write(m, p.font_desc); |
ParamTraits<uint32_t>::Write(m, p.color); |
ParamTraits<PP_Point>::Write(m, p.position); |
ParamTraits<PP_Rect>::Write(m, p.clip); |
@@ -216,14 +216,14 @@ void ParamTraits<pp::proxy::PPBFlash_DrawGlyphs_Params>::Write( |
} |
// static |
-bool ParamTraits<pp::proxy::PPBFlash_DrawGlyphs_Params>::Read( |
+bool ParamTraits<ppapi::proxy::PPBFlash_DrawGlyphs_Params>::Read( |
const Message* m, |
void** iter, |
param_type* r) { |
return |
ParamTraits<PP_Instance>::Read(m, iter, &r->instance) && |
ParamTraits<ppapi::HostResource>::Read(m, iter, &r->image_data) && |
- ParamTraits<pp::proxy::SerializedFontDescription>::Read(m, iter, |
+ ParamTraits<ppapi::proxy::SerializedFontDescription>::Read(m, iter, |
&r->font_desc) && |
ParamTraits<uint32_t>::Read(m, iter, &r->color) && |
ParamTraits<PP_Point>::Read(m, iter, &r->position) && |
@@ -243,7 +243,7 @@ bool ParamTraits<pp::proxy::PPBFlash_DrawGlyphs_Params>::Read( |
} |
// static |
-void ParamTraits<pp::proxy::PPBFlash_DrawGlyphs_Params>::Log( |
+void ParamTraits<ppapi::proxy::PPBFlash_DrawGlyphs_Params>::Log( |
const param_type& p, |
std::string* l) { |
} |
@@ -251,28 +251,28 @@ void ParamTraits<pp::proxy::PPBFlash_DrawGlyphs_Params>::Log( |
// PPBFileRef_CreateInfo ------------------------------------------------------- |
// static |
-void ParamTraits<pp::proxy::PPBFileRef_CreateInfo>::Write( |
+void ParamTraits<ppapi::proxy::PPBFileRef_CreateInfo>::Write( |
Message* m, |
const param_type& p) { |
ParamTraits<ppapi::HostResource>::Write(m, p.resource); |
ParamTraits<int>::Write(m, p.file_system_type); |
- ParamTraits<pp::proxy::SerializedVar>::Write(m, p.path); |
- ParamTraits<pp::proxy::SerializedVar>::Write(m, p.name); |
+ ParamTraits<ppapi::proxy::SerializedVar>::Write(m, p.path); |
+ ParamTraits<ppapi::proxy::SerializedVar>::Write(m, p.name); |
} |
// static |
-bool ParamTraits<pp::proxy::PPBFileRef_CreateInfo>::Read(const Message* m, |
- void** iter, |
- param_type* r) { |
+bool ParamTraits<ppapi::proxy::PPBFileRef_CreateInfo>::Read(const Message* m, |
+ void** iter, |
+ param_type* r) { |
return |
ParamTraits<ppapi::HostResource>::Read(m, iter, &r->resource) && |
ParamTraits<int>::Read(m, iter, &r->file_system_type) && |
- ParamTraits<pp::proxy::SerializedVar>::Read(m, iter, &r->path) && |
- ParamTraits<pp::proxy::SerializedVar>::Read(m, iter, &r->name); |
+ ParamTraits<ppapi::proxy::SerializedVar>::Read(m, iter, &r->path) && |
+ ParamTraits<ppapi::proxy::SerializedVar>::Read(m, iter, &r->name); |
} |
// static |
-void ParamTraits<pp::proxy::PPBFileRef_CreateInfo>::Log( |
+void ParamTraits<ppapi::proxy::PPBFileRef_CreateInfo>::Log( |
const param_type& p, |
std::string* l) { |
} |
@@ -280,7 +280,7 @@ void ParamTraits<pp::proxy::PPBFileRef_CreateInfo>::Log( |
// PPBURLLoader_UpdateProgress_Params ------------------------------------------ |
// static |
-void ParamTraits<pp::proxy::PPBURLLoader_UpdateProgress_Params>::Write( |
+void ParamTraits<ppapi::proxy::PPBURLLoader_UpdateProgress_Params>::Write( |
Message* m, |
const param_type& p) { |
ParamTraits<PP_Instance>::Write(m, p.instance); |
@@ -292,7 +292,7 @@ void ParamTraits<pp::proxy::PPBURLLoader_UpdateProgress_Params>::Write( |
} |
// static |
-bool ParamTraits<pp::proxy::PPBURLLoader_UpdateProgress_Params>::Read( |
+bool ParamTraits<ppapi::proxy::PPBURLLoader_UpdateProgress_Params>::Read( |
const Message* m, |
void** iter, |
param_type* r) { |
@@ -306,7 +306,7 @@ bool ParamTraits<pp::proxy::PPBURLLoader_UpdateProgress_Params>::Read( |
} |
// static |
-void ParamTraits<pp::proxy::PPBURLLoader_UpdateProgress_Params>::Log( |
+void ParamTraits<ppapi::proxy::PPBURLLoader_UpdateProgress_Params>::Log( |
const param_type& p, |
std::string* l) { |
} |
@@ -314,32 +314,32 @@ void ParamTraits<pp::proxy::PPBURLLoader_UpdateProgress_Params>::Log( |
// SerializedDirEntry ---------------------------------------------------------- |
// static |
-void ParamTraits<pp::proxy::SerializedDirEntry>::Write(Message* m, |
- const param_type& p) { |
+void ParamTraits<ppapi::proxy::SerializedDirEntry>::Write(Message* m, |
+ const param_type& p) { |
ParamTraits<std::string>::Write(m, p.name); |
ParamTraits<bool>::Write(m, p.is_dir); |
} |
// static |
-bool ParamTraits<pp::proxy::SerializedDirEntry>::Read(const Message* m, |
- void** iter, |
- param_type* r) { |
+bool ParamTraits<ppapi::proxy::SerializedDirEntry>::Read(const Message* m, |
+ void** iter, |
+ param_type* r) { |
return ParamTraits<std::string>::Read(m, iter, &r->name) && |
ParamTraits<bool>::Read(m, iter, &r->is_dir); |
} |
// static |
-void ParamTraits<pp::proxy::SerializedDirEntry>::Log(const param_type& p, |
- std::string* l) { |
+void ParamTraits<ppapi::proxy::SerializedDirEntry>::Log(const param_type& p, |
+ std::string* l) { |
} |
-// pp::proxy::SerializedFontDescription ---------------------------------------- |
+// ppapi::proxy::SerializedFontDescription ------------------------------------- |
// static |
-void ParamTraits<pp::proxy::SerializedFontDescription>::Write( |
+void ParamTraits<ppapi::proxy::SerializedFontDescription>::Write( |
Message* m, |
const param_type& p) { |
- ParamTraits<pp::proxy::SerializedVar>::Write(m, p.face); |
+ ParamTraits<ppapi::proxy::SerializedVar>::Write(m, p.face); |
ParamTraits<int32_t>::Write(m, p.family); |
ParamTraits<uint32_t>::Write(m, p.size); |
ParamTraits<int32_t>::Write(m, p.weight); |
@@ -350,12 +350,12 @@ void ParamTraits<pp::proxy::SerializedFontDescription>::Write( |
} |
// static |
-bool ParamTraits<pp::proxy::SerializedFontDescription>::Read( |
+bool ParamTraits<ppapi::proxy::SerializedFontDescription>::Read( |
const Message* m, |
void** iter, |
param_type* r) { |
return |
- ParamTraits<pp::proxy::SerializedVar>::Read(m, iter, &r->face) && |
+ ParamTraits<ppapi::proxy::SerializedVar>::Read(m, iter, &r->face) && |
ParamTraits<int32_t>::Read(m, iter, &r->family) && |
ParamTraits<uint32_t>::Read(m, iter, &r->size) && |
ParamTraits<int32_t>::Read(m, iter, &r->weight) && |
@@ -366,7 +366,7 @@ bool ParamTraits<pp::proxy::SerializedFontDescription>::Read( |
} |
// static |
-void ParamTraits<pp::proxy::SerializedFontDescription>::Log( |
+void ParamTraits<ppapi::proxy::SerializedFontDescription>::Log( |
const param_type& p, |
std::string* l) { |
} |
@@ -401,33 +401,33 @@ void ParamTraits<ppapi::HostResource>::Log(const param_type& p, |
// SerializedVar --------------------------------------------------------------- |
// static |
-void ParamTraits<pp::proxy::SerializedVar>::Write(Message* m, |
- const param_type& p) { |
+void ParamTraits<ppapi::proxy::SerializedVar>::Write(Message* m, |
+ const param_type& p) { |
p.WriteToMessage(m); |
} |
// static |
-bool ParamTraits<pp::proxy::SerializedVar>::Read(const Message* m, |
- void** iter, |
- param_type* r) { |
+bool ParamTraits<ppapi::proxy::SerializedVar>::Read(const Message* m, |
+ void** iter, |
+ param_type* r) { |
return r->ReadFromMessage(m, iter); |
} |
// static |
-void ParamTraits<pp::proxy::SerializedVar>::Log(const param_type& p, |
- std::string* l) { |
+void ParamTraits<ppapi::proxy::SerializedVar>::Log(const param_type& p, |
+ std::string* l) { |
} |
// std::vector<SerializedVar> -------------------------------------------------- |
-void ParamTraits< std::vector<pp::proxy::SerializedVar> >::Write( |
+void ParamTraits< std::vector<ppapi::proxy::SerializedVar> >::Write( |
Message* m, |
const param_type& p) { |
WriteVectorWithoutCopy(m, p); |
} |
// static |
-bool ParamTraits< std::vector<pp::proxy::SerializedVar> >::Read( |
+bool ParamTraits< std::vector<ppapi::proxy::SerializedVar> >::Read( |
const Message* m, |
void** iter, |
param_type* r) { |
@@ -435,21 +435,21 @@ bool ParamTraits< std::vector<pp::proxy::SerializedVar> >::Read( |
} |
// static |
-void ParamTraits< std::vector<pp::proxy::SerializedVar> >::Log( |
+void ParamTraits< std::vector<ppapi::proxy::SerializedVar> >::Log( |
const param_type& p, |
std::string* l) { |
} |
// std::vector<PPBFileRef_CreateInfo> ------------------------------------------ |
-void ParamTraits< std::vector<pp::proxy::PPBFileRef_CreateInfo> >::Write( |
+void ParamTraits< std::vector<ppapi::proxy::PPBFileRef_CreateInfo> >::Write( |
Message* m, |
const param_type& p) { |
WriteVectorWithoutCopy(m, p); |
} |
// static |
-bool ParamTraits< std::vector<pp::proxy::PPBFileRef_CreateInfo> >::Read( |
+bool ParamTraits< std::vector<ppapi::proxy::PPBFileRef_CreateInfo> >::Read( |
const Message* m, |
void** iter, |
param_type* r) { |
@@ -457,7 +457,7 @@ bool ParamTraits< std::vector<pp::proxy::PPBFileRef_CreateInfo> >::Read( |
} |
// static |
-void ParamTraits< std::vector<pp::proxy::PPBFileRef_CreateInfo> >::Log( |
+void ParamTraits< std::vector<ppapi::proxy::PPBFileRef_CreateInfo> >::Log( |
const param_type& p, |
std::string* l) { |
} |
@@ -465,21 +465,22 @@ void ParamTraits< std::vector<pp::proxy::PPBFileRef_CreateInfo> >::Log( |
// SerializedFlashMenu --------------------------------------------------------- |
// static |
-void ParamTraits<pp::proxy::SerializedFlashMenu>::Write(Message* m, |
- const param_type& p) { |
+void ParamTraits<ppapi::proxy::SerializedFlashMenu>::Write( |
+ Message* m, |
+ const param_type& p) { |
p.WriteToMessage(m); |
} |
// static |
-bool ParamTraits<pp::proxy::SerializedFlashMenu>::Read(const Message* m, |
- void** iter, |
- param_type* r) { |
+bool ParamTraits<ppapi::proxy::SerializedFlashMenu>::Read(const Message* m, |
+ void** iter, |
+ param_type* r) { |
return r->ReadFromMessage(m, iter); |
} |
// static |
-void ParamTraits<pp::proxy::SerializedFlashMenu>::Log(const param_type& p, |
- std::string* l) { |
+void ParamTraits<ppapi::proxy::SerializedFlashMenu>::Log(const param_type& p, |
+ std::string* l) { |
} |
} // namespace IPC |