Remove PP_Module from parameters for PPB_Var.VarFromUtf8.

ppapi/proxy/ppb_var_deprecated_proxy.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/proxy/ppb_var_deprecated_proxy.h"
 
 #include <stdlib.h>  // For malloc
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "ppapi/c/dev/ppb_var_deprecated.h"
 #include "ppapi/c/pp_var.h"
+#include "ppapi/c/ppb_var.h"
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_globals.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/plugin_var_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppp_class_proxy.h"
 #include "ppapi/proxy/serialized_var.h"
+#include "ppapi/shared_impl/ppb_var_impl.h"
 #include "ppapi/shared_impl/var.h"
 
 namespace ppapi {
 namespace proxy {
 
 namespace {
 
 // Used to do get the set-up information for calling a var object. If the
 // exception is set, returns NULL. Otherwise, computes the dispatcher for the
 // given var object. If the var is not a valid object, returns NULL and sets
@@ skipping 11 matching lines @@
     PluginDispatcher* dispatcher =
         PluginGlobals::Get()->plugin_var_tracker()->
             DispatcherForPluginObject(object);
     if (dispatcher)
       return dispatcher;
   }
 
   // The object is invalid. This means we can't figure out which dispatcher
   // to use, which is OK because the call will fail anyway. Set the exception.
   if (exception) {
-    *exception = StringVar::StringToPPVar(0,
+    *exception = StringVar::StringToPPVar(
         std::string("Attempting to use an invalid object"));
   }
   return NULL;
 }
 
 // PPB_Var_Deprecated plugin ---------------------------------------------------
 
-void AddRefVar(PP_Var var) {
-  PpapiGlobals::Get()->GetVarTracker()->AddRefVar(var);
-}
-
-void ReleaseVar(PP_Var var) {
-  PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(var);
-}
-
-PP_Var VarFromUtf8(PP_Module module, const char* data, uint32_t len) {
-  return StringVar::StringToPPVar(module, data, len);
-}
-
-const char* VarToUtf8(PP_Var var, uint32_t* len) {
-  StringVar* str = StringVar::FromPPVar(var);
-  if (str) {
-    *len = static_cast<uint32_t>(str->value().size());
-    return str->value().c_str();
-  }
-  *len = 0;
-  return NULL;
-}
-
 bool HasProperty(PP_Var var,
                  PP_Var name,
                  PP_Var* exception) {
   Dispatcher* dispatcher = CheckExceptionAndGetDispatcher(var, exception);
   if (!dispatcher)
     return false;
 
   ReceiveSerializedException se(dispatcher, exception);
   PP_Bool result = PP_FALSE;
   if (!se.IsThrown()) {
@@ skipping 172 matching lines @@
   ReceiveSerializedVarReturnValue result;
   int64 class_int = static_cast<int64>(reinterpret_cast<intptr_t>(ppp_class));
   int64 data_int =
       static_cast<int64>(reinterpret_cast<intptr_t>(ppp_class_data));
   dispatcher->Send(new PpapiHostMsg_PPBVar_CreateObjectDeprecated(
       API_ID_PPB_VAR_DEPRECATED, instance, class_int, data_int,
       &result));
   return result.Return(dispatcher);
 }
 
-const PPB_Var_Deprecated var_deprecated_interface = {
-  &AddRefVar,
-  &ReleaseVar,
-  &VarFromUtf8,
-  &VarToUtf8,
-  &HasProperty,
-  &HasMethod,
-  &GetProperty,
-  &EnumerateProperties,
-  &SetProperty,
-  &RemoveProperty,
-  &Call,
-  &Construct,
-  &IsInstanceOf,
-  &CreateObject
-};
-
 InterfaceProxy* CreateVarDeprecatedProxy(Dispatcher* dispatcher) {
   return new PPB_Var_Deprecated_Proxy(dispatcher );
 }
 
 }  // namespace
 
 PPB_Var_Deprecated_Proxy::PPB_Var_Deprecated_Proxy(
     Dispatcher* dispatcher)
     : InterfaceProxy(dispatcher),
       task_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       ppb_var_impl_(NULL) {
   if (!dispatcher->IsPlugin()) {
     ppb_var_impl_ = static_cast<const PPB_Var_Deprecated*>(
         dispatcher->local_get_interface()(PPB_VAR_DEPRECATED_INTERFACE));
   }
 }
 
 PPB_Var_Deprecated_Proxy::~PPB_Var_Deprecated_Proxy() {
 }
 
 // static
 const InterfaceProxy::Info* PPB_Var_Deprecated_Proxy::GetInfo() {
+  static const PPB_Var_Deprecated var_deprecated_interface = {
+    ppapi::PPB_Var_Impl::GetVarInterface1_0()->AddRef,
+    ppapi::PPB_Var_Impl::GetVarInterface1_0()->Release,
+    ppapi::PPB_Var_Impl::GetVarInterface1_0()->VarFromUtf8,
+    ppapi::PPB_Var_Impl::GetVarInterface1_0()->VarToUtf8,
+    &HasProperty,
+    &HasMethod,
+    &GetProperty,
+    &EnumerateProperties,
+    &SetProperty,
+    &RemoveProperty,
+    &Call,
+    &Construct,
+    &IsInstanceOf,
+    &CreateObject
+  };
+
   static const Info info = {
     &var_deprecated_interface,
     PPB_VAR_DEPRECATED_INTERFACE,
     API_ID_PPB_VAR_DEPRECATED,
     false,
     &CreateVarDeprecatedProxy,
   };
   return &info;
 }
 
@@ skipping 199 matching lines @@
 
 void PPB_Var_Deprecated_Proxy::DoReleaseObject(int64 object_id) {
   PP_Var var;
   var.type = PP_VARTYPE_OBJECT;
   var.value.as_id = object_id;
   ppb_var_impl_->Release(var);
 }
 
 }  // namespace proxy
 }  // namespace ppapi