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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ipc/ipc_message_utils.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 | « ipc/ipc_message_utils.h ('k') | ipc/ipc_message_utils_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/ipc_message_utils.cc
diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc
index 58dc510331447b21f8f6809d40e1a8fd4f935a93..f86022c691a09cded39dc2cd21928bcaca8b9646 100644
--- a/ipc/ipc_message_utils.cc
+++ b/ipc/ipc_message_utils.cc
@@ -54,7 +54,9 @@ void LogBytes(const std::vector<CharType>& data, std::string* out) {
#endif
}
-bool ReadValue(const Message* m, PickleIterator* iter, base::Value** value,
+bool ReadValue(const Message* m,
+ base::PickleIterator* iter,
+ base::Value** value,
int recursion);
void WriteValue(Message* m, const base::Value* value, int recursion) {
@@ -130,8 +132,10 @@ void WriteValue(Message* m, const base::Value* value, int recursion) {
// Helper for ReadValue that reads a DictionaryValue into a pre-allocated
// object.
-bool ReadDictionaryValue(const Message* m, PickleIterator* iter,
- base::DictionaryValue* value, int recursion) {
+bool ReadDictionaryValue(const Message* m,
+ base::PickleIterator* iter,
+ base::DictionaryValue* value,
+ int recursion) {
int size;
if (!ReadParam(m, iter, &size))
return false;
@@ -150,8 +154,10 @@ bool ReadDictionaryValue(const Message* m, PickleIterator* iter,
// Helper for ReadValue that reads a ReadListValue into a pre-allocated
// object.
-bool ReadListValue(const Message* m, PickleIterator* iter,
- base::ListValue* value, int recursion) {
+bool ReadListValue(const Message* m,
+ base::PickleIterator* iter,
+ base::ListValue* value,
+ int recursion) {
int size;
if (!ReadParam(m, iter, &size))
return false;
@@ -166,7 +172,9 @@ bool ReadListValue(const Message* m, PickleIterator* iter,
return true;
}
-bool ReadValue(const Message* m, PickleIterator* iter, base::Value** value,
+bool ReadValue(const Message* m,
+ base::PickleIterator* iter,
+ base::Value** value,
int recursion) {
if (recursion > kMaxRecursionDepth) {
LOG(WARNING) << "Max recursion depth hit in ReadValue.";
@@ -261,8 +269,9 @@ void ParamTraits<unsigned char>::Write(Message* m, const param_type& p) {
m->WriteBytes(&p, sizeof(param_type));
}
-bool ParamTraits<unsigned char>::Read(const Message* m, PickleIterator* iter,
- param_type* r) {
+bool ParamTraits<unsigned char>::Read(const Message* m,
+ base::PickleIterator* iter,
+ param_type* r) {
const char* data;
if (!iter->ReadBytes(&data, sizeof(param_type)))
return false;
@@ -278,7 +287,8 @@ void ParamTraits<unsigned short>::Write(Message* m, const param_type& p) {
m->WriteBytes(&p, sizeof(param_type));
}
-bool ParamTraits<unsigned short>::Read(const Message* m, PickleIterator* iter,
+bool ParamTraits<unsigned short>::Read(const Message* m,
+ base::PickleIterator* iter,
param_type* r) {
const char* data;
if (!iter->ReadBytes(&data, sizeof(param_type)))
@@ -323,7 +333,8 @@ void ParamTraits<double>::Write(Message* m, const param_type& p) {
m->WriteBytes(reinterpret_cast<const char*>(&p), sizeof(param_type));
}
-bool ParamTraits<double>::Read(const Message* m, PickleIterator* iter,
+bool ParamTraits<double>::Read(const Message* m,
+ base::PickleIterator* iter,
param_type* r) {
const char *data;
if (!iter->ReadBytes(&data, sizeof(*r))) {
@@ -355,9 +366,9 @@ void ParamTraits<std::vector<char> >::Write(Message* m, const param_type& p) {
}
}
-bool ParamTraits<std::vector<char> >::Read(const Message* m,
- PickleIterator* iter,
- param_type* r) {
+bool ParamTraits<std::vector<char>>::Read(const Message* m,
+ base::PickleIterator* iter,
+ param_type* r) {
const char *data;
int data_size = 0;
if (!iter->ReadData(&data, &data_size) || data_size < 0)
@@ -382,9 +393,9 @@ void ParamTraits<std::vector<unsigned char> >::Write(Message* m,
}
}
-bool ParamTraits<std::vector<unsigned char> >::Read(const Message* m,
- PickleIterator* iter,
- param_type* r) {
+bool ParamTraits<std::vector<unsigned char>>::Read(const Message* m,
+ base::PickleIterator* iter,
+ param_type* r) {
const char *data;
int data_size = 0;
if (!iter->ReadData(&data, &data_size) || data_size < 0)
@@ -409,9 +420,9 @@ void ParamTraits<std::vector<bool> >::Write(Message* m, const param_type& p) {
WriteParam(m, static_cast<bool>(p[i]));
}
-bool ParamTraits<std::vector<bool> >::Read(const Message* m,
- PickleIterator* iter,
- param_type* r) {
+bool ParamTraits<std::vector<bool>>::Read(const Message* m,
+ base::PickleIterator* iter,
+ param_type* r) {
int size;
// ReadLength() checks for < 0 itself.
if (!iter->ReadLength(&size))
@@ -439,8 +450,9 @@ void ParamTraits<base::DictionaryValue>::Write(Message* m,
WriteValue(m, &p, 0);
}
-bool ParamTraits<base::DictionaryValue>::Read(
- const Message* m, PickleIterator* iter, param_type* r) {
+bool ParamTraits<base::DictionaryValue>::Read(const Message* m,
+ base::PickleIterator* iter,
+ param_type* r) {
int type;
if (!ReadParam(m, iter, &type) || type != base::Value::TYPE_DICTIONARY)
return false;
@@ -474,7 +486,7 @@ void ParamTraits<base::FileDescriptor>::Write(Message* m, const param_type& p) {
}
bool ParamTraits<base::FileDescriptor>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* r) {
*r = base::FileDescriptor();
@@ -509,7 +521,7 @@ void ParamTraits<base::FilePath>::Write(Message* m, const param_type& p) {
}
bool ParamTraits<base::FilePath>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* r) {
return r->ReadFromPickle(iter);
}
@@ -522,8 +534,9 @@ void ParamTraits<base::ListValue>::Write(Message* m, const param_type& p) {
WriteValue(m, &p, 0);
}
-bool ParamTraits<base::ListValue>::Read(
- const Message* m, PickleIterator* iter, param_type* r) {
+bool ParamTraits<base::ListValue>::Read(const Message* m,
+ base::PickleIterator* iter,
+ param_type* r) {
int type;
if (!ReadParam(m, iter, &type) || type != base::Value::TYPE_LIST)
return false;
@@ -544,7 +557,7 @@ void ParamTraits<base::NullableString16>::Write(Message* m,
}
bool ParamTraits<base::NullableString16>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* r) {
base::string16 string;
if (!ReadParam(m, iter, &string))
@@ -575,7 +588,7 @@ void ParamTraits<base::File::Info>::Write(Message* m,
}
bool ParamTraits<base::File::Info>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* p) {
double last_modified, last_accessed, creation_time;
if (!ReadParam(m, iter, &p->size) ||
@@ -609,7 +622,8 @@ void ParamTraits<base::Time>::Write(Message* m, const param_type& p) {
ParamTraits<int64>::Write(m, p.ToInternalValue());
}
-bool ParamTraits<base::Time>::Read(const Message* m, PickleIterator* iter,
+bool ParamTraits<base::Time>::Read(const Message* m,
+ base::PickleIterator* iter,
param_type* r) {
int64 value;
if (!ParamTraits<int64>::Read(m, iter, &value))
@@ -627,7 +641,7 @@ void ParamTraits<base::TimeDelta>::Write(Message* m, const param_type& p) {
}
bool ParamTraits<base::TimeDelta>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* r) {
int64 value;
bool ret = ParamTraits<int64>::Read(m, iter, &value);
@@ -646,7 +660,7 @@ void ParamTraits<base::TimeTicks>::Write(Message* m, const param_type& p) {
}
bool ParamTraits<base::TimeTicks>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* r) {
int64 value;
bool ret = ParamTraits<int64>::Read(m, iter, &value);
@@ -665,7 +679,7 @@ void ParamTraits<base::TraceTicks>::Write(Message* m, const param_type& p) {
}
bool ParamTraits<base::TraceTicks>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* r) {
int64 value;
bool ret = ParamTraits<int64>::Read(m, iter, &value);
@@ -691,7 +705,7 @@ void ParamTraits<IPC::ChannelHandle>::Write(Message* m, const param_type& p) {
}
bool ParamTraits<IPC::ChannelHandle>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* r) {
return ReadParam(m, iter, &r->name)
#if defined(OS_POSIX)
@@ -723,7 +737,7 @@ void ParamTraits<LogData>::Write(Message* m, const param_type& p) {
}
bool ParamTraits<LogData>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* r) {
return
ReadParam(m, iter, &r->channel) &&
@@ -764,7 +778,8 @@ void ParamTraits<Message>::Write(Message* m, const Message& p) {
m->WriteData(p.payload(), static_cast<uint32>(p.payload_size()));
}
-bool ParamTraits<Message>::Read(const Message* m, PickleIterator* iter,
+bool ParamTraits<Message>::Read(const Message* m,
+ base::PickleIterator* iter,
Message* r) {
uint32 routing_id, type, flags;
if (!iter->ReadUInt32(&routing_id) ||
@@ -792,7 +807,8 @@ void ParamTraits<HANDLE>::Write(Message* m, const param_type& p) {
m->WriteInt(HandleToLong(p));
}
-bool ParamTraits<HANDLE>::Read(const Message* m, PickleIterator* iter,
+bool ParamTraits<HANDLE>::Read(const Message* m,
+ base::PickleIterator* iter,
param_type* r) {
int32 temp;
if (!iter->ReadInt(&temp))
@@ -809,7 +825,8 @@ void ParamTraits<LOGFONT>::Write(Message* m, const param_type& p) {
m->WriteData(reinterpret_cast<const char*>(&p), sizeof(LOGFONT));
}
-bool ParamTraits<LOGFONT>::Read(const Message* m, PickleIterator* iter,
+bool ParamTraits<LOGFONT>::Read(const Message* m,
+ base::PickleIterator* iter,
param_type* r) {
const char *data;
int data_size = 0;
@@ -833,7 +850,8 @@ void ParamTraits<MSG>::Write(Message* m, const param_type& p) {
m->WriteData(reinterpret_cast<const char*>(&p), sizeof(MSG));
}
-bool ParamTraits<MSG>::Read(const Message* m, PickleIterator* iter,
+bool ParamTraits<MSG>::Read(const Message* m,
+ base::PickleIterator* iter,
param_type* r) {
const char *data;
int data_size = 0;
« no previous file with comments | « ipc/ipc_message_utils.h ('k') | ipc/ipc_message_utils_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698