diff options
| -rw-r--r-- | ppapi/shared_impl/resource_tracker.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/ppapi/shared_impl/resource_tracker.cc b/ppapi/shared_impl/resource_tracker.cc index 717c038..303e980 100644 --- a/ppapi/shared_impl/resource_tracker.cc +++ b/ppapi/shared_impl/resource_tracker.cc @@ -144,11 +144,8 @@ PP_Resource ResourceTracker::AddResource(Resource* object) { if (found == instance_map_.end()) { // If you hit this, it's likely somebody forgot to call DidCreateInstance, // the resource was created with an invalid PP_Instance, or the renderer - // side tried to create a resource for a plugin that crashed/exited. This - // could happen for OOP plugins where due to reentrancies in context of - // outgoing sync calls the renderer can send events after a plugin has - // exited. - DLOG(INFO) << "Failed to find plugin instance in instance map"; + // side tried to create a resource for a plugin that crashed. + NOTREACHED(); return 0; } @@ -161,9 +158,8 @@ PP_Resource ResourceTracker::AddResource(Resource* object) { void ResourceTracker::RemoveResource(Resource* object) { PP_Resource pp_resource = object->pp_resource(); - InstanceMap::iterator found = instance_map_.find(object->pp_instance()); - if (found != instance_map_.end()) - instance_map_.erase(found); + if (object->pp_instance()) + instance_map_[object->pp_instance()]->resources.erase(pp_resource); live_resources_.erase(pp_resource); } |