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

Unified Diff: ppapi/proxy/raw_var_data.cc

Issue 825353003: Revert of Remove deprecated methods from Pickle. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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/proxy/ppapi_param_traits.cc ('k') | ppapi/proxy/serialized_flash_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/raw_var_data.cc
diff --git a/ppapi/proxy/raw_var_data.cc b/ppapi/proxy/raw_var_data.cc
index ac925c9fd56c6c5fdc10aa21c5a768a7c2757bfc..97a6d944ae583e969ba74e1ceea2f152db5ebdc9 100644
--- a/ppapi/proxy/raw_var_data.cc
+++ b/ppapi/proxy/raw_var_data.cc
@@ -188,11 +188,11 @@
PickleIterator* iter) {
scoped_ptr<RawVarDataGraph> result(new RawVarDataGraph);
uint32_t size = 0;
- if (!iter->ReadUInt32(&size))
+ if (!m->ReadUInt32(iter, &size))
return scoped_ptr<RawVarDataGraph>();
for (uint32_t i = 0; i < size; ++i) {
int32_t type;
- if (!iter->ReadInt(&type))
+ if (!m->ReadInt(iter, &type))
return scoped_ptr<RawVarDataGraph>();
PP_VarType var_type = static_cast<PP_VarType>(type);
result->data_.push_back(RawVarData::Create(var_type));
@@ -323,13 +323,13 @@
break;
case PP_VARTYPE_BOOL: {
bool bool_value;
- if (!iter->ReadBool(&bool_value))
+ if (!m->ReadBool(iter, &bool_value))
return false;
result.value.as_bool = PP_FromBool(bool_value);
break;
}
case PP_VARTYPE_INT32:
- if (!iter->ReadInt(&result.value.as_int))
+ if (!m->ReadInt(iter, &result.value.as_int))
return false;
break;
case PP_VARTYPE_DOUBLE:
@@ -337,7 +337,7 @@
return false;
break;
case PP_VARTYPE_OBJECT:
- if (!iter->ReadInt64(&result.value.as_id))
+ if (!m->ReadInt64(iter, &result.value.as_id))
return false;
break;
default:
@@ -385,7 +385,7 @@
bool StringRawVarData::Read(PP_VarType type,
const IPC::Message* m,
PickleIterator* iter) {
- if (!iter->ReadString(&data_))
+ if (!m->ReadString(iter, &data_))
return false;
return true;
}
@@ -503,12 +503,12 @@
const IPC::Message* m,
PickleIterator* iter) {
int shmem_type;
- if (!iter->ReadInt(&shmem_type))
+ if (!m->ReadInt(iter, &shmem_type))
return false;
type_ = static_cast<ShmemType>(shmem_type);
switch (type_) {
case ARRAY_BUFFER_SHMEM_HOST:
- if (!iter->ReadInt(&host_shm_handle_id_))
+ if (!m->ReadInt(iter, &host_shm_handle_id_))
return false;
break;
case ARRAY_BUFFER_SHMEM_PLUGIN:
@@ -518,7 +518,7 @@
}
break;
case ARRAY_BUFFER_NO_SHMEM:
- if (!iter->ReadString(&data_))
+ if (!m->ReadString(iter, &data_))
return false;
break;
default:
@@ -584,11 +584,11 @@
const IPC::Message* m,
PickleIterator* iter) {
uint32_t size;
- if (!iter->ReadUInt32(&size))
+ if (!m->ReadUInt32(iter, &size))
return false;
for (uint32_t i = 0; i < size; ++i) {
uint32_t index;
- if (!iter->ReadUInt32(&index))
+ if (!m->ReadUInt32(iter, &index))
return false;
children_.push_back(index);
}
@@ -650,14 +650,14 @@
const IPC::Message* m,
PickleIterator* iter) {
uint32_t size;
- if (!iter->ReadUInt32(&size))
+ if (!m->ReadUInt32(iter, &size))
return false;
for (uint32_t i = 0; i < size; ++i) {
std::string key;
uint32_t value;
- if (!iter->ReadString(&key))
+ if (!m->ReadString(iter, &key))
return false;
- if (!iter->ReadUInt32(&value))
+ if (!m->ReadUInt32(iter, &value))
return false;
children_.push_back(make_pair(key, value));
}
@@ -727,15 +727,15 @@
const IPC::Message* m,
PickleIterator* iter) {
int value;
- if (!iter->ReadInt(&value))
+ if (!m->ReadInt(iter, &value))
return false;
pp_resource_ = static_cast<PP_Resource>(value);
- if (!iter->ReadInt(&pending_renderer_host_id_))
- return false;
- if (!iter->ReadInt(&pending_browser_host_id_))
+ if (!m->ReadInt(iter, &pending_renderer_host_id_))
+ return false;
+ if (!m->ReadInt(iter, &pending_browser_host_id_))
return false;
bool has_creation_message;
- if (!iter->ReadBool(&has_creation_message))
+ if (!m->ReadBool(iter, &has_creation_message))
return false;
if (has_creation_message) {
creation_message_.reset(new IPC::Message());
« no previous file with comments | « ppapi/proxy/ppapi_param_traits.cc ('k') | ppapi/proxy/serialized_flash_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698