Remove webkit::ppapi::Resource.

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>
@@ skipping 18 matching lines @@
 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,
                         public ::ppapi::ResourceTracker {
  public:
   // Returns the pointer to the singleton object.
   static ResourceTracker* Get();
 
   // PP_Resources --------------------------------------------------------------
 
   // TrackerBase.
   virtual ::ppapi::FunctionGroupBase* GetFunctionAPI(
       PP_Instance pp_instance,
       ::ppapi::proxy::InterfaceID id) OVERRIDE;
   virtual ::ppapi::VarTracker* GetVarTracker() OVERRIDE;
   virtual ::ppapi::ResourceTracker* GetResourceTracker() OVERRIDE;
 
+  // ppapi::ResourceTracker overrides.
+  virtual void LastPluginRefWasDeleted(::ppapi::Resource* object) 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
@@ skipping 31 matching lines @@
   void InstanceDeleted(PP_Instance instance);
 
   void InstanceCrashed(PP_Instance instance);
 
   // Returns a pointer to the plugin instance object associated with the given
   // instance handle. The return value will be NULL if the handle is invalid or
   // if the instance has crashed.
   PluginInstance* GetInstance(PP_Instance instance);
 
  private:
-  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();
   virtual ~ResourceTracker();
@@ skipping 25 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 ID.
-  PP_Resource last_resource_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;
-  ResourceMap live_resources_;
-
   // Like ResourceAndRefCount but for vars, which are associated with modules.
   typedef std::pair<scoped_refptr< ::ppapi::Var>, size_t> VarAndRefCount;
   typedef base::hash_map<int32, VarAndRefCount> VarMap;
   VarMap live_vars_;
 
   // Tracks all live instances and their associated data.
   typedef std::map<PP_Instance, linked_ptr<InstanceData> > InstanceMap;
   InstanceMap instance_map_;
 
   // Tracks all live modules. The pointers are non-owning, the PluginModule
   // destructor will notify us when the module is deleted.
   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_