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

webkit/plugins/ppapi/ppapi_webplugin_impl.h

 // 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.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_PPAPI_WEBPLUGIN_IMPL_H_
 #define WEBKIT_PLUGINS_PPAPI_PPAPI_WEBPLUGIN_IMPL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "ppapi/c/pp_var.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h"
+#include "third_party/npapi/bindings/npruntime.h"
 #include "ui/gfx/rect.h"
 #include "webkit/plugins/webkit_plugins_export.h"
 
 namespace WebKit {
 struct WebPluginParams;
 struct WebPrintParams;
 }
 
 namespace webkit {
 namespace ppapi {
@@ skipping 10 matching lines @@
       const WebKit::WebPluginParams& params,
       const base::WeakPtr<PluginDelegate>& plugin_delegate);
 
   PluginInstance* instance() { return instance_.get(); }
 
   // WebKit::WebPlugin implementation.
   virtual WebKit::WebPluginContainer* container() const;
   virtual bool initialize(WebKit::WebPluginContainer* container);
   virtual void destroy();
   virtual NPObject* scriptableObject();
+  virtual NPP pluginNPP();

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

Yuck - the ppapi bindings shouldn't depend on npapi at all.  Can you refactor
this in a way that NPAPI-agnostic?

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

The PPAPI bindings already depend on NPAPI for scriptableObject, so this isn't
adding a new dependency as such.

Right now PPAPI still has legacy support for synchronous-scriptable plugins,
IIRC. Once that goes away these APIs can be made to return NULL or moved to e.g.
an WebPluginWithNPAPI interface.

Technically it's possible for pluginNPP() to return void*, since the calling
code never looks inside the NPP, but that ends up introducing messy re-interpret
casts and doesn't help with the NPObject dependency on the line above.

[Bernhard Bauer, 2013/05/16 09:26:55]

But you have reinterpret casts right now too!

I would prefer a NPAPI-neutral return value too (and maybe a neutral method name
as well?).

   virtual bool getFormValue(WebKit::WebString& value);
   virtual void paint(WebKit::WebCanvas* canvas, const WebKit::WebRect& rect);
   virtual void updateGeometry(
       const WebKit::WebRect& frame_rect,
       const WebKit::WebRect& clip_rect,
       const WebKit::WebVector<WebKit::WebRect>& cut_outs_rects,
       bool is_visible);
   virtual void updateFocus(bool focused);
   virtual void updateVisibility(bool visible);
   virtual bool acceptsInputEvents();
@@ skipping 45 matching lines @@
   PP_Var instance_object_;
   WebKit::WebPluginContainer* container_;
 
   DISALLOW_COPY_AND_ASSIGN(WebPluginImpl);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPAPI_WEBPLUGIN_IMPL_H_