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

content/renderer/browser_plugin/browser_plugin.cc

Index: content/renderer/browser_plugin/browser_plugin.cc
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
index d3aa325a9fb4c9f1de03e0419ba32f783f8684da..9e383a94268626deb362eb489ea3b05278824f2f 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -1137,6 +1137,9 @@ bool BrowserPlugin::initialize(WebPluginContainer* container) {
   if (!GetContentClient()->renderer()->AllowBrowserPlugin(container))
     return false;
 
+  // Tell |container| to allow this plugin to use script objects.

[Fady Samuel, 2013/05/15 23:21:15]

Does webview.contentWindow work without this workaround?
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/renderer/re...

[Wez, 2013/05/16 18:27:16]

It will do once patch [3/3] has landed in Blink, yes.

+  container->allowScriptObjects();
+
   bindings_.reset(new BrowserPluginBindings(this));
   container_ = container;
   container_->setWantsWheelEvents(true);
@@ -1180,6 +1183,9 @@ void BrowserPlugin::EnableCompositing(bool enable) {
 }
 
 void BrowserPlugin::destroy() {
+  // Tell |container_| to clear references to this plugin's script objects.
+  container_->clearScriptObjects();
+
   // The BrowserPlugin's WebPluginContainer is deleted immediately after this
   // call returns, so let's not keep a reference to it around.
   g_plugin_container_map.Get().erase(container_);
@@ -1202,6 +1208,13 @@ NPObject* BrowserPlugin::scriptableObject() {
   return browser_plugin_np_object;
 }
 
+NPP BrowserPlugin::pluginNPP() {
+  // We must return the same pointer that the NPP parameter to NPObject binding
+  // calls will contain. WebKit will treat it as opaque, though, so it needn't
+  // be an actual NPP_t instance.
+  return reinterpret_cast<NPP>(this);
+}
+
 bool BrowserPlugin::supportsKeyboardFocus() const {
   return true;
 }