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

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

Issue 8826011: Remove PP_Module from parameters for PPB_Var.VarFromUtf8. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 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/plugin_ppb_var.cc
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_var.cc b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_var.cc
index 558272ef9ad63a44a25932ffe86cef74ec3b7cfe..65823c837545283883e941515dce85676f8c752d 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_var.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_var.cc
@@ -35,9 +35,8 @@ void Release(PP_Var var) {
ProxyVarCache::GetInstance().ReleaseProxyVar(var);
}
-PP_Var VarFromUtf8(PP_Module module_id, const char* data, uint32_t len) {
+PP_Var VarFromUtf8(const char* data, uint32_t len) {
DebugPrintf("PPB_Var::VarFromUtf8: data='%.*s'\n", len, data);
- UNREFERENCED_PARAMETER(module_id);
if (!StringIsUtf8(data, len)) {
DebugPrintf("PPB_Var::VarFromUtf8: not UTF8\n");
return PP_MakeNull();
@@ -53,6 +52,10 @@ PP_Var VarFromUtf8(PP_Module module_id, const char* data, uint32_t len) {
return var;
}
+PP_Var VarFromUtf8_1_0(PP_Module /*module*/, const char* data, uint32_t len) {
+ return VarFromUtf8(data, len);
+}
+
const char* VarToUtf8(PP_Var var, uint32_t* len) {
DebugPrintf("PPB_Var::VarToUtf8: as_id=%"NACL_PRId64"\n", var.value.as_id);
SharedStringProxyVar string_var = StringProxyVar::CastFromProxyVar(
@@ -92,6 +95,16 @@ const PPB_Var* PluginVar::GetInterface() {
return &var_interface;
}
+const PPB_Var_1_0* PluginVar::GetInterface1_0() {
+ static const PPB_Var_1_0 var_interface = {
+ AddRef,
+ Release,
+ VarFromUtf8_1_0,
+ VarToUtf8
+ };
+ return &var_interface;
+}
+
std::string PluginVar::DebugString(const PP_Var& var) {
switch (var.type) {
case PP_VARTYPE_UNDEFINED:
@@ -137,7 +150,7 @@ std::string PluginVar::DebugString(const PP_Var& var) {
return "##ERROR##";
}
-PP_Var PluginVar::StringToPPVar(PP_Module module_id, const std::string& str) {
+PP_Var PluginVar::StringToPPVar(const std::string& str) {
static const PPB_Var* ppb_var = NULL;
if (ppb_var == NULL) {
ppb_var = static_cast<const PPB_Var*>(
@@ -146,8 +159,8 @@ PP_Var PluginVar::StringToPPVar(PP_Module module_id, const std::string& str) {
if (ppb_var == NULL) {
return PP_MakeUndefined();
}
- return ppb_var->VarFromUtf8(
- module_id, str.c_str(), nacl::assert_cast<uint32_t>(str.size()));
+ return ppb_var->VarFromUtf8(str.c_str(),
+ nacl::assert_cast<uint32_t>(str.size()));
}
std::string PluginVar::PPVarToString(const PP_Var& var) {

Powered by Google App Engine
This is Rietveld 408576698