Add a unified resource tracker shared between the proxy and the impl.

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/resource_tracker.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 {
 
 class PluginInstance;
 class PluginModule;
 class Resource;
 class ResourceTrackerTest;
 
 // This class maintains a global list of all live pepper resources. It allows
 // us to check resource ID validity and to map them to a specific module.
 //
 // This object is NOT threadsafe.
-class ResourceTracker : public ::ppapi::TrackerBase {
+class ResourceTracker : public ::ppapi::TrackerBase,
+                        public ::ppapi::ResourceTracker {
  public:
   // Returns the pointer to the singleton object.
   static ResourceTracker* Get();
 
   // PP_Resources --------------------------------------------------------------
 
-  // The returned pointer will be NULL if there is no resource. Note that this
-  // return value is a scoped_refptr so that we ensure the resource is valid
-  // from the point of the lookup to the point that the calling code needs it.
-  // Otherwise, the plugin could Release() the resource on another thread and
-  // the object will get deleted out from under us.
-  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;
-
   // 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;
+  virtual ::ppapi::ResourceTracker* GetResourceTracker() OVERRIDE;
 
   // PP_Vars -------------------------------------------------------------------
 
   // 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.
   ::ppapi::NPObjectVar* NPObjectVarForNPObject(PP_Instance instance,
                                                NPObject* np_object);
 
+  // Returns the number of NPObjectVar's associated with the given instance.
+  // Returns 0 if the instance isn't known.
+  int GetLiveNPObjectVarsForInstance(PP_Instance instance) const;
+
   // PP_Modules ----------------------------------------------------------------
 
   // Adds a new plugin module to the list of tracked module, and returns a new
   // module handle to identify it.
   PP_Module AddModule(PluginModule* module);
 
   // Called when a plugin modulde was deleted and should no longer be tracked.
   // The given handle should be one generated by AddModule.
   void ModuleDeleted(PP_Module module);
 
@@ skipping 22 matching lines @@
   friend class Resource;
   friend class ResourceTrackerTest;
 
   typedef std::set<PP_Resource> ResourceSet;
 
   // Per-instance data we track.
   struct InstanceData;
 
   // Prohibit creation other then by the Singleton class.
   ResourceTracker();
-  ~ResourceTracker();
-
-  // Called when a new resource is created and associates it with its
-  // PluginInstance.
-  void ResourceCreated(Resource* resource, PluginInstance* instance);
-
-  // Removes a resource from the resource map.
-  void ResourceDestroyed(Resource* resource);
-
-  // Adds the given resource to the tracker and assigns it a resource ID and
-  // refcount of 1. The assigned resource ID will be returned. Used only by the
-  // Resource class.
-  PP_Resource AddResource(Resource* resource);
+  virtual ~ResourceTracker();
 
   // Force frees all vars and resources associated with the given instance.
   // If delete_instance is true, the instance tracking information will also
   // be deleted.
   void CleanupInstanceData(PP_Instance instance, bool delete_instance);
 
   // Overrides the singleton object. This is used for tests which want to
   // specify their own tracker (otherwise, you can get cross-talk between
   // tests since the data will live into the subsequent tests).
   static void SetSingletonOverride(ResourceTracker* tracker);
@@ skipping 52 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_