Unify var tracking between webkit and the proxy.

webkit/plugins/ppapi/ppb_var_impl.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 "webkit/plugins/ppapi/ppb_var_impl.h"
 
 #include <limits>
 
 #include "ppapi/c/dev/ppb_var_deprecated.h"
 #include "ppapi/c/ppb_var.h"
@@ skipping 151 matching lines @@
   NPIdentifier identifier() const { return identifier_; }
 
  private:
   NPIdentifier identifier_;
 
   DISALLOW_COPY_AND_ASSIGN(ObjectAccessorWithIdentifierTryCatch);
 };
 
 // PPB_Var methods -------------------------------------------------------------
 
+void AddRefVar(PP_Var var) {
+  ResourceTracker::Get()->GetVarTracker()->AddRefVar(var);
+}
+
+void ReleaseVar(PP_Var var) {
+  ResourceTracker::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) {
   scoped_refptr<StringVar> str(StringVar::FromPPVar(var));
   if (!str) {
     *len = 0;
     return NULL;
   }
@@ skipping 229 matching lines @@
                                         const PPP_Class_Deprecated* ppp_class,
                                         void* ppp_class_data) {
   PluginModule* module = ResourceTracker::Get()->GetModule(module_id);
   if (!module)
     return PP_MakeNull();
   return PluginObject::Create(module->GetSomeInstance(),
                               ppp_class, ppp_class_data);
 }
 
 const PPB_Var_Deprecated var_deprecated_interface = {
-  &Var::PluginAddRefPPVar,
-  &Var::PluginReleasePPVar,
+  &AddRefVar,
+  &ReleaseVar,
   &VarFromUtf8,
   &VarToUtf8,
   &HasPropertyDeprecated,
   &HasMethodDeprecated,
   &GetProperty,
   &EnumerateProperties,
   &SetPropertyDeprecated,
   &DeletePropertyDeprecated,
   &CallDeprecated,
   &Construct,
   &IsInstanceOfDeprecated,
   &CreateObjectDeprecated,
   &CreateObjectWithModuleDeprecated,
 };
 
 const PPB_Var var_interface = {
-  &Var::PluginAddRefPPVar,
-  &Var::PluginReleasePPVar,
+  &AddRefVar,
+  &ReleaseVar,
   &VarFromUtf8,
   &VarToUtf8
 };
 
 }  // namespace
 
 // static
 const PPB_Var* PPB_Var_Impl::GetVarInterface() {
   return &var_interface;
 }
 
 // static
 const PPB_Var_Deprecated* PPB_Var_Impl::GetVarDeprecatedInterface() {
   return &var_deprecated_interface;
 }
 
 }  // namespace ppapi
 }  // namespace webkit