Track NPObject ownership by the originating plugins' NPP identifier. [4/6] (Chrome)

content/plugin/webplugin_delegate_stub.cc

Index: content/plugin/webplugin_delegate_stub.cc
diff --git a/content/plugin/webplugin_delegate_stub.cc b/content/plugin/webplugin_delegate_stub.cc
index afc5022eec0ad76b855b5c7bcafd4a976a616977..9b7dd6f37dbfa95df859f71662e4ae9e9a1ae40b 100644
--- a/content/plugin/webplugin_delegate_stub.cc
+++ b/content/plugin/webplugin_delegate_stub.cc
@@ -40,6 +40,10 @@ static void DestroyWebPluginAndDelegate(
   // after calling NPP_Destroy on the instance, so delete the stub now.
   if (scriptable_object.get())
     scriptable_object->DeleteSoon();
+
+  // Un-register the plugin instance as an object owner.
+  WebBindings::unregisterObjectOwner(delegate->GetPluginNPP());
+
   // WebPlugin must outlive WebPluginDelegate.
   if (delegate)
     delegate->PluginDestroyed();
@@ -76,6 +80,9 @@ WebPluginDelegateStub::~WebPluginDelegateStub() {
     DestroyWebPluginAndDelegate(
         plugin_scriptable_object_, delegate_, webplugin_);
   }
+
+  // Remove the NPObject owner mapping for this instance.
+  channel_->RemoveMappingForNPObjectOwner(instance_id_);
 }
 
 bool WebPluginDelegateStub::OnMessageReceived(const IPC::Message& msg) {
@@ -175,6 +182,14 @@ void WebPluginDelegateStub::OnInit(const PluginMsg_Init_Params& params,
     std::vector<std::string> arg_names = params.arg_names;
     std::vector<std::string> arg_values = params.arg_values;
 
+    // Register the plugin as a valid object owner.
+    WebBindings::registerObjectOwner(delegate_->GetPluginNPP());
+
+    // Add an NPObject owner mapping for this instance, to support ownership
+    // tracking in the renderer.
+    channel_->AddMappingForNPObjectOwner(instance_id_,
+                                         delegate_->GetPluginNPP());
+
     *result = delegate_->Initialize(params.url,
                                     arg_names,
                                     arg_values,