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

Unified Diff: ppapi/native_client/src/shared/ppapi_proxy/object_serialize.cc

Issue 8826011: Remove PP_Module from parameters for PPB_Var.VarFromUtf8. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix windows build and some nacl tests. Created 9 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
Index: ppapi/native_client/src/shared/ppapi_proxy/object_serialize.cc
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/object_serialize.cc b/ppapi/native_client/src/shared/ppapi_proxy/object_serialize.cc
index 7fa0e02d88ec5676f7db14d507fa5e0941d8b928..cab24326fa8a4e5dab0e7204600ba01d5e94e5d9 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/object_serialize.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/object_serialize.cc
@@ -324,22 +324,19 @@ uint32_t DeserializePpVarSize(char* p,
// there are enough bytes at p.
//
bool DeserializeString(char* p,
- PP_Var* var,
- NaClSrpcChannel* channel) {
+ PP_Var* var) {
SerializedString* ss = reinterpret_cast<SerializedString*>(p);
uint32_t string_length = ss->fixed.u.string_length;
// VarFromUtf8 creates a buffer of size string_length using the browser-side
// memory allocation function, and copies string_length bytes from
// ss->string_bytes in to that buffer. The ref count of the returned var is
// 1.
- *var = PPBVarInterface()->VarFromUtf8(LookupModuleIdForSrpcChannel(channel),
- ss->string_bytes,
+ *var = PPBVarInterface()->VarFromUtf8(ss->string_bytes,
string_length);
return true;
}
-bool DeserializePpVar(NaClSrpcChannel* channel,
- char* bytes,
+bool DeserializePpVar(char* bytes,
uint32_t length,
PP_Var* vars,
uint32_t argc) {
@@ -370,7 +367,7 @@ bool DeserializePpVar(NaClSrpcChannel* channel,
break;
}
case PP_VARTYPE_STRING:
- if (!DeserializeString(p, &vars[i], channel)) {
+ if (!DeserializeString(p, &vars[i])) {
return false;
}
break;
@@ -441,8 +438,7 @@ char* Serialize(const PP_Var* vars, uint32_t argc, uint32_t* length) {
return bytes;
}
-bool DeserializeTo(NaClSrpcChannel* channel,
- char* bytes,
+bool DeserializeTo(char* bytes,
uint32_t length,
uint32_t argc,
PP_Var* vars) {
@@ -459,7 +455,7 @@ bool DeserializeTo(NaClSrpcChannel* channel,
return false;
}
// Read the serialized PP_Vars into the allocated memory.
- if (!DeserializePpVar(channel, bytes, length, vars, argc)) {
+ if (!DeserializePpVar(bytes, length, vars, argc)) {
return false;
}
return true;

Powered by Google App Engine
This is Rietveld 408576698