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

content/renderer/browser_plugin/browser_plugin.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 "content/renderer/browser_plugin/browser_plugin.h"
 
 #include "base/command_line.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
@@ skipping 1119 matching lines @@
   RespondPermissionIfRequestIsPending(request_id, allow);
 }
 
 bool BrowserPlugin::initialize(WebPluginContainer* container) {
   if (!container)
     return false;
 
   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);
   ParseAttributes();
   g_plugin_container_map.Get().insert(std::make_pair(container_, this));
   return true;
 }
 
 void BrowserPlugin::EnableCompositing(bool enable) {
   if (compositing_enabled_ == enable)
@@ skipping 23 matching lines @@
     resize_ack_received_ = false;
     browser_plugin_manager()->Send(new BrowserPluginHostMsg_ResizeGuest(
         render_view_routing_id_,
         instance_id_,
         params));
   }
   compositing_helper_->EnableCompositing(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_);
   container_ = NULL;
   if (compositing_helper_)
     compositing_helper_->OnContainerDestroy();
   // Will be a no-op if the mouse is not currently locked.
   if (render_view_)
     render_view_->mouse_lock_dispatcher()->OnLockTargetDestroyed(this);
   base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
 NPObject* BrowserPlugin::scriptableObject() {
   if (!bindings_)
     return NULL;
 
   NPObject* browser_plugin_np_object(bindings_->np_object());
   // The object is expected to be retained before it is returned.
   WebKit::WebBindings::retainObject(browser_plugin_np_object);
   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;
 }
 
 bool BrowserPlugin::canProcessDrag() const {
   return true;
 }
 
 void BrowserPlugin::paint(WebCanvas* canvas, const WebRect& rect) {
   if (guest_crashed_) {
@@ skipping 338 matching lines @@
     const WebKit::WebMouseEvent& event) {
   browser_plugin_manager()->Send(
       new BrowserPluginHostMsg_HandleInputEvent(render_view_routing_id_,
                                                 instance_id_,
                                                 plugin_rect_,
                                                 &event));
   return true;
 }
 
 }  // namespace content