Index: webkit/plugins/ppapi/resource.cc |
diff --git a/webkit/plugins/ppapi/resource.cc b/webkit/plugins/ppapi/resource.cc |
index cb4ae37d227b05780c81db0688b4d9c7b916649f..a84e1d30d50eaec80b476d1a6cc9861333ed64f7 100644 |
--- a/webkit/plugins/ppapi/resource.cc |
+++ b/webkit/plugins/ppapi/resource.cc |
@@ -14,40 +14,29 @@ namespace webkit { |
namespace ppapi { |
Resource::Resource(PluginInstance* instance) |
- : ResourceObjectBase(instance->pp_instance()), |
- resource_id_(0), |
+ : ::ppapi::Resource(instance->pp_instance()), |
instance_(instance) { |
- ResourceTracker::Get()->ResourceCreated(this, instance_); |
} |
Resource::~Resource() { |
- ResourceTracker::Get()->ResourceDestroyed(this); |
} |
PP_Resource Resource::GetReference() { |
- ResourceTracker *tracker = ResourceTracker::Get(); |
- if (resource_id_) |
- tracker->AddRefResource(resource_id_); |
- else |
- resource_id_ = tracker->AddResource(this); |
- return resource_id_; |
+ ResourceTracker* tracker = ResourceTracker::Get(); |
+ tracker->AddRefResource(pp_resource()); |
+ return pp_resource(); |
} |
-PP_Resource Resource::GetReferenceNoAddRef() const { |
- return resource_id_; |
+void Resource::LastPluginRefWasDeleted() { |
+ instance()->module()->GetCallbackTracker()->PostAbortForResource( |
+ pp_resource()); |
} |
-void Resource::ClearInstance() { |
+void Resource::InstanceWasDeleted() { |
+ ::ppapi::Resource::InstanceWasDeleted(); |
instance_ = NULL; |
} |
-void Resource::LastPluginRefWasDeleted() { |
- DCHECK(resource_id_ != 0); |
- instance()->module()->GetCallbackTracker()->PostAbortForResource( |
- resource_id_); |
- resource_id_ = 0; |
-} |
- |
} // namespace ppapi |
} // namespace webkit |