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

webkit/plugins/ppapi/ppapi_webplugin_impl.cc

 // Copyright (c) 2012 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/ppapi_webplugin_impl.h"
 
 #include <cmath>
 
 #include "base/debug/crash_logging.h"
 #include "base/message_loop.h"
@@ skipping 75 matching lines @@
   // The plugin delegate may have gone away.
   if (!init_data_->delegate)
     return false;
 
   instance_ = init_data_->module->CreateInstance(init_data_->delegate,
                                                  container,
                                                  init_data_->url);
   if (!instance_)
     return false;
 
+  // Enable script objects for this plugin.
+  container->allowScriptObjects();
+
   bool success = instance_->Initialize(init_data_->arg_names,
                                        init_data_->arg_values,
                                        full_frame_);
   if (!success) {
     instance_->Delete();
     instance_ = NULL;
 
     WebKit::WebPlugin* replacement_plugin =
         init_data_->delegate->CreatePluginReplacement(
             init_data_->module->path());
     if (!replacement_plugin || !replacement_plugin->initialize(container))
       return false;
 
     container->setPlugin(replacement_plugin);
     return true;
   }
 
   init_data_.reset();
   container_ = container;
   return true;
 }
 
 void WebPluginImpl::destroy() {
+  // Tell |container_| to clear references to this plugin's script objects.
+  container_->clearScriptObjects();
+
   if (instance_) {
     ::ppapi::PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(instance_object_);
     instance_object_ = PP_MakeUndefined();
     instance_->Delete();
     instance_ = NULL;
   }
 
   base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
@@ skipping 12 matching lines @@
   // any non-postMessage calls to it.
   if (object) {
     instance_->message_channel().SetPassthroughObject(object->np_object());
   }
   NPObject* message_channel_np_object(instance_->message_channel().np_object());
   // The object is expected to be retained before it is returned.
   WebKit::WebBindings::retainObject(message_channel_np_object);
   return message_channel_np_object;
 }
 
+NPP WebPluginImpl::pluginNPP() {
+  return instance_->instanceNPP();
+}
+
 bool WebPluginImpl::getFormValue(WebString& value) {
   return false;
 }
 
 void WebPluginImpl::paint(WebCanvas* canvas, const WebRect& rect) {
   if (!instance_->FlashIsFullscreenOrPending())
     instance_->Paint(canvas, plugin_rect_, rect);
 }
 
 void WebPluginImpl::updateGeometry(
@@ skipping 124 matching lines @@
 void WebPluginImpl::rotateView(RotationType type) {
   instance_->RotateView(type);
 }
 
 bool WebPluginImpl::isPlaceholder() {
   return false;
 }
 
 }  // namespace ppapi
 }  // namespace webkit