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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ppapi/proxy/ppapi_param_traits.cc

Issue 1154283003: Change most uses of Pickle to base::Pickle (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 | « ppapi/nacl_irt/ppapi_dispatcher.cc ('k') | ppapi/proxy/raw_var_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/ppapi_param_traits.cc
diff --git a/ppapi/proxy/ppapi_param_traits.cc b/ppapi/proxy/ppapi_param_traits.cc
index c3e5af17503bd4389968c7c8a08543d036cea7bb..3895b31b8648289d1dd8115efdd31df63498682e 100644
--- a/ppapi/proxy/ppapi_param_traits.cc
+++ b/ppapi/proxy/ppapi_param_traits.cc
@@ -36,9 +36,9 @@ namespace {
//
// The solution is to make a new object for each deserialized item, and then
// add it to the vector one at a time.
-template<typename T>
+template <typename T>
bool ReadVectorWithoutCopy(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
std::vector<T>* output) {
// This part is just a copy of the the default ParamTraits vector Read().
int size;
@@ -81,7 +81,7 @@ void ParamTraits<PP_Bool>::Write(Message* m, const param_type& p) {
// static
bool ParamTraits<PP_Bool>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* r) {
// We specifically want to be strict here about what types of input we accept,
// which ParamTraits<bool> does for us. We don't want to deserialize "2" into
@@ -109,7 +109,7 @@ void ParamTraits<PP_KeyInformation>::Write(Message* m, const param_type& p) {
// static
bool ParamTraits<PP_KeyInformation>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* p) {
uint32_t size;
if (!ReadParam(m, iter, &size))
@@ -154,7 +154,7 @@ void ParamTraits<PP_NetAddress_Private>::Write(Message* m,
// static
bool ParamTraits<PP_NetAddress_Private>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* p) {
uint16 size;
if (!ReadParam(m, iter, &size))
@@ -189,7 +189,7 @@ void ParamTraits<ppapi::HostResource>::Write(Message* m,
// static
bool ParamTraits<ppapi::HostResource>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* r) {
PP_Instance instance;
PP_Resource resource;
@@ -215,7 +215,7 @@ void ParamTraits<ppapi::proxy::SerializedVar>::Write(Message* m,
// static
bool ParamTraits<ppapi::proxy::SerializedVar>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* r) {
return r->ReadFromMessage(m, iter);
}
@@ -234,9 +234,9 @@ void ParamTraits< std::vector<ppapi::proxy::SerializedVar> >::Write(
}
// static
-bool ParamTraits< std::vector<ppapi::proxy::SerializedVar> >::Read(
+bool ParamTraits<std::vector<ppapi::proxy::SerializedVar>>::Read(
const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* r) {
return ReadVectorWithoutCopy(m, iter, r);
}
@@ -256,7 +256,7 @@ void ParamTraits<ppapi::PpapiPermissions>::Write(Message* m,
// static
bool ParamTraits<ppapi::PpapiPermissions>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* r) {
uint32_t bits;
if (!ParamTraits<uint32_t>::Read(m, iter, &bits))
@@ -291,9 +291,10 @@ void ParamTraits<ppapi::proxy::SerializedHandle>::Write(Message* m,
}
// static
-bool ParamTraits<ppapi::proxy::SerializedHandle>::Read(const Message* m,
- PickleIterator* iter,
- param_type* r) {
+bool ParamTraits<ppapi::proxy::SerializedHandle>::Read(
+ const Message* m,
+ base::PickleIterator* iter,
+ param_type* r) {
ppapi::proxy::SerializedHandle::Header header;
if (!ppapi::proxy::SerializedHandle::ReadHeader(iter, &header))
return false;
@@ -351,7 +352,7 @@ void ParamTraits<ppapi::proxy::PPBURLLoader_UpdateProgress_Params>::Write(
// static
bool ParamTraits<ppapi::proxy::PPBURLLoader_UpdateProgress_Params>::Read(
const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* r) {
return
ParamTraits<PP_Instance>::Read(m, iter, &r->instance) &&
@@ -397,7 +398,7 @@ void ParamTraits<ppapi::proxy::PPBFlash_DrawGlyphs_Params>::Write(
// static
bool ParamTraits<ppapi::proxy::PPBFlash_DrawGlyphs_Params>::Read(
const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* r) {
return
ParamTraits<PP_Instance>::Read(m, iter, &r->instance) &&
@@ -438,9 +439,10 @@ void ParamTraits<ppapi::proxy::SerializedDirEntry>::Write(Message* m,
}
// static
-bool ParamTraits<ppapi::proxy::SerializedDirEntry>::Read(const Message* m,
- PickleIterator* iter,
- param_type* r) {
+bool ParamTraits<ppapi::proxy::SerializedDirEntry>::Read(
+ const Message* m,
+ base::PickleIterator* iter,
+ param_type* r) {
return ParamTraits<std::string>::Read(m, iter, &r->name) &&
ParamTraits<bool>::Read(m, iter, &r->is_dir);
}
@@ -469,7 +471,7 @@ void ParamTraits<ppapi::proxy::SerializedFontDescription>::Write(
// static
bool ParamTraits<ppapi::proxy::SerializedFontDescription>::Read(
const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* r) {
return
ParamTraits<std::string>::Read(m, iter, &r->face) &&
@@ -506,7 +508,7 @@ void ParamTraits<ppapi::proxy::SerializedTrueTypeFontDesc>::Write(
// static
bool ParamTraits<ppapi::proxy::SerializedTrueTypeFontDesc>::Read(
const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* r) {
return
ParamTraits<std::string>::Read(m, iter, &r->family) &&
@@ -536,7 +538,7 @@ void ParamTraits<ppapi::PepperFilePath>::Write(Message* m,
// static
bool ParamTraits<ppapi::PepperFilePath>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* p) {
unsigned domain;
base::FilePath path;
@@ -570,9 +572,10 @@ void ParamTraits<ppapi::proxy::SerializedFlashMenu>::Write(
}
// static
-bool ParamTraits<ppapi::proxy::SerializedFlashMenu>::Read(const Message* m,
- PickleIterator* iter,
- param_type* r) {
+bool ParamTraits<ppapi::proxy::SerializedFlashMenu>::Read(
+ const Message* m,
+ base::PickleIterator* iter,
+ param_type* r) {
return r->ReadFromMessage(m, iter);
}
@@ -592,9 +595,10 @@ void ParamTraits<ppapi::PPB_X509Certificate_Fields>::Write(
}
// static
-bool ParamTraits<ppapi::PPB_X509Certificate_Fields>::Read(const Message* m,
- PickleIterator* iter,
- param_type* r) {
+bool ParamTraits<ppapi::PPB_X509Certificate_Fields>::Read(
+ const Message* m,
+ base::PickleIterator* iter,
+ param_type* r) {
return ParamTraits<base::ListValue>::Read(m, iter, &(r->values_));
}
@@ -640,7 +644,7 @@ void ParamTraits<ppapi::SocketOptionData>::Write(Message* m,
// static
bool ParamTraits<ppapi::SocketOptionData>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* r) {
*r = ppapi::SocketOptionData();
int32_t type = 0;
@@ -692,7 +696,7 @@ void ParamTraits<ppapi::CompositorLayerData::Transform>::Write(
// static
bool ParamTraits<ppapi::CompositorLayerData::Transform>::Read(
const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* r) {
for (size_t i = 0; i < arraysize(r->matrix);i++) {
if (!ParamTraits<float>::Read(m, iter, &r->matrix[i]))
« no previous file with comments | « ppapi/nacl_irt/ppapi_dispatcher.cc ('k') | ppapi/proxy/raw_var_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698