Remove webkit::ppapi::Resource.

webkit/plugins/ppapi/resource_tracker.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/resource_tracker.h"
 
 #include <limits>
 #include <set>
 
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/shared_impl/function_group_base.h"
 #include "ppapi/shared_impl/id_assignment.h"
 #include "ppapi/shared_impl/tracker_base.h"
+#include "webkit/plugins/ppapi/callbacks.h"
 #include "webkit/plugins/ppapi/npobject_var.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_char_set_impl.h"
 #include "webkit/plugins/ppapi/ppb_cursor_control_impl.h"
 #include "webkit/plugins/ppapi/ppb_find_impl.h"
 #include "webkit/plugins/ppapi/ppb_font_impl.h"
-#include "webkit/plugins/ppapi/resource.h"
 #include "webkit/plugins/ppapi/resource_creation_impl.h"
+#include "webkit/plugins/ppapi/resource_helper.h"
 
 using ppapi::CheckIdType;
 using ppapi::MakeTypedId;
 using ppapi::NPObjectVar;
 using ppapi::PPIdType;
 using ppapi::Var;
 
 namespace webkit {
 namespace ppapi {
 
@@ skipping 22 matching lines @@
 
   // Lazily allocated function proxies for the different interfaces.
   scoped_ptr< ::ppapi::FunctionGroupBase >
       function_proxies[::ppapi::proxy::INTERFACE_ID_COUNT];
 };
 
 // static
 ResourceTracker* ResourceTracker::global_tracker_ = NULL;
 ResourceTracker* ResourceTracker::singleton_override_ = NULL;
 
-ResourceTracker::ResourceTracker()
-    : last_resource_id_(0) {
+ResourceTracker::ResourceTracker() {
   // Wire up the new shared resource tracker base to use our implementation.
   ::ppapi::TrackerBase::Init(&GetTrackerBase);
 }
 
 ResourceTracker::~ResourceTracker() {
 }
 
 // static
 ResourceTracker* ResourceTracker::Get() {
   if (singleton_override_)
@@ skipping 79 matching lines @@
 }
 
 ::ppapi::VarTracker* ResourceTracker::GetVarTracker() {
   return &var_tracker_;
 }
 
 ::ppapi::ResourceTracker* ResourceTracker::GetResourceTracker() {
   return this;
 }
 
+void ResourceTracker::LastPluginRefWasDeleted(::ppapi::Resource* object) {
+  ::ppapi::ResourceTracker::LastPluginRefWasDeleted(object);
+
+  // TODO(brettw) this should be removed when we have the callback tracker
+  // moved to the shared_impl. This will allow the logic to post aborts for
+  // any callbacks directly in the Resource::LastPluginRefWasDeleted function
+  // and we can remove this function altogether.
+  PluginModule* plugin_module = ResourceHelper::GetPluginModule(object);
+  if (plugin_module) {
+    plugin_module->GetCallbackTracker()->PostAbortForResource(
+        object->pp_resource());
+  }
+}
+
 void ResourceTracker::AddNPObjectVar(NPObjectVar* object_var) {
   DCHECK(instance_map_.find(object_var->pp_instance()) != instance_map_.end());
   InstanceData& data = *instance_map_[object_var->pp_instance()].get();
 
   DCHECK(data.np_object_to_object_var.find(object_var->np_object()) ==
          data.np_object_to_object_var.end()) << "NPObjectVar already in map";
   data.np_object_to_object_var[object_var->np_object()] = object_var;
 }
 
 void ResourceTracker::RemoveNPObjectVar(NPObjectVar* object_var) {
@@ skipping 121 matching lines @@
 
 // static
 void ResourceTracker::ClearSingletonOverride() {
   DCHECK(singleton_override_);
   singleton_override_ = NULL;
 }
 
 }  // namespace ppapi
 }  // namespace webkit