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 130 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() {
+  // 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

[jamesr, 2013/05/15 22:32:15]

if it's opaque anyway, can we fix the type to not be an NPAPI type?

[Wez, 2013/05/15 23:14:16]

There's not really any point in doing that right now (see scriptableObject()
above), but yes in principle this could be simply void*, or a dedicated
WebPluginId typedef, for example.

+  // be an actual NPP_t instance.
+  return reinterpret_cast<NPP>(this);
+}
+
 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 136 matching lines @@
 void WebPluginImpl::rotateView(RotationType type) {
   instance_->RotateView(type);
 }
 
 bool WebPluginImpl::isPlaceholder() {
   return false;
 }
 
 }  // namespace ppapi
 }  // namespace webkit