Unify var tracking between webkit and the proxy.

webkit/plugins/ppapi/resource_tracker.h

 // 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.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_RESOURCE_TRACKER_H_
 #define WEBKIT_PLUGINS_PPAPI_RESOURCE_TRACKER_H_
 
 #include <map>
 #include <set>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/proxy/interface_id.h"
 #include "ppapi/shared_impl/function_group_base.h"
 #include "ppapi/shared_impl/tracker_base.h"
+#include "ppapi/shared_impl/var_tracker.h"
 
 typedef struct NPObject NPObject;
 
 namespace ppapi {
 class NPObjectVar;
 class Var;
 }
 
 namespace webkit {
 namespace ppapi {
@@ skipping 22 matching lines @@
   scoped_refptr<Resource> GetResource(PP_Resource res) const;
 
   // Increment resource's plugin refcount. See ResourceAndRefCount comments
   // below.
   bool AddRefResource(PP_Resource res);
   bool UnrefResource(PP_Resource res);
 
   // Returns the number of resources associated with this module.
   uint32 GetLiveObjectsForInstance(PP_Instance instance) const;
 
-  // ResourceTrackerBase.
+  // TrackerBase.
   virtual ::ppapi::ResourceObjectBase* GetResourceAPI(
       PP_Resource res) OVERRIDE;
   virtual ::ppapi::FunctionGroupBase* GetFunctionAPI(
       PP_Instance pp_instance,
       pp::proxy::InterfaceID id) OVERRIDE;
   virtual PP_Instance GetInstanceForResource(PP_Resource resource) OVERRIDE;
+  virtual ::ppapi::VarTracker* GetVarTracker() OVERRIDE;
 
   // PP_Vars -------------------------------------------------------------------
 
-  // TrackerBase implementation.
-  virtual int32 AddVar(::ppapi::Var* var) OVERRIDE;
-  virtual scoped_refptr< ::ppapi::Var > GetVar(int32 var_id) const OVERRIDE;
-  virtual bool AddRefVar(int32 var_id) OVERRIDE;
-  virtual bool UnrefVar(int32 var_id) OVERRIDE;
-
   // Tracks all live NPObjectVar. This is so we can map between instance +
   // NPObject and get the NPObjectVar corresponding to it. This Add/Remove
   // function is called by the NPObjectVar when it is created and
   // destroyed.
   void AddNPObjectVar(::ppapi::NPObjectVar* object_var);
   void RemoveNPObjectVar(::ppapi::NPObjectVar* object_var);
 
   // Looks up a previously registered NPObjectVar for the given NPObject and
   // instance. Returns NULL if there is no NPObjectVar corresponding to the
   // given NPObject for the given instance. See AddNPObjectVar above.
@@ skipping 83 matching lines @@
   // layer via the delegate, which may be in a random state of shutdown.
   //
   // So effectively our rule is: any resources still around at shutdown are
   // associated with leaked plugins in WebKit, so it's also OK to leak those
   // resources from here (avoiding the shutdown race).
   static ResourceTracker* global_tracker_;
 
   // See SetSingletonOverride above.
   static ResourceTracker* singleton_override_;
 
-  // Last assigned resource & var ID.
+  // Last assigned resource ID.
   PP_Resource last_resource_id_;
-  int32 last_var_id_;
+
+  ::ppapi::VarTracker var_tracker_;
 
   // For each PP_Resource, keep the Resource* (as refptr) and plugin use count.
   // This use count is different then Resource's RefCount, and is manipulated
   // using this AddRefResource/UnrefResource. When it drops to zero, we just
   // remove the resource from this resource tracker, but the resource object
   // will be alive so long as some scoped_refptr still holds it's
   // reference. This prevents plugins from forcing destruction of Resource
   // objects.
   typedef std::pair<scoped_refptr<Resource>, size_t> ResourceAndRefCount;
   typedef base::hash_map<PP_Resource, ResourceAndRefCount> ResourceMap;
@@ skipping 13 matching lines @@
   typedef std::map<PP_Module, PluginModule*> ModuleMap;
   ModuleMap module_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceTracker);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_RESOURCE_TRACKER_H_