webkit/plugins/ppapi/ppapi_webplugin_impl.h - Issue 15007012: Track NPObject ownership by the originating plugins' NPP identifier. [2/3] (Chrome)

Unified Diff: webkit/plugins/ppapi/ppapi_webplugin_impl.h

Issue 15007012: Track NPObject ownership by the originating plugins' NPP identifier. [2/3] (Chrome) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add missing includes. Created 7 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« webkit/plugins/npapi/webplugin_impl.cc ('K') | « webkit/plugins/npapi/webplugin_impl.cc ('k') | webkit/plugins/ppapi/ppapi_webplugin_impl.cc » ('j') | webkit/plugins/ppapi/ppapi_webplugin_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webkit/plugins/ppapi/ppapi_webplugin_impl.h

diff --git a/webkit/plugins/ppapi/ppapi_webplugin_impl.h b/webkit/plugins/ppapi/ppapi_webplugin_impl.h

index 0ea0080d0082f47bf40baa20c509de39b1cfc11e..5af6ae79fe1284d67b5c9934520f9f107c8528d7 100644

--- a/webkit/plugins/ppapi/ppapi_webplugin_impl.h

+++ b/webkit/plugins/ppapi/ppapi_webplugin_impl.h

@@ -13,6 +13,7 @@

#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"

@@ -43,6 +44,7 @@ class WebPluginImpl : public WebKit::WebPlugin {

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 npap

Wez 2013/05/15 23:14:16 The PPAPI bindings already depend on NPAPI for scr

Bernhard Bauer 2013/05/16 09:26:55 But you have reinterpret casts right now too! I w

virtual bool getFormValue(WebKit::WebString& value);

virtual void paint(WebKit::WebCanvas* canvas, const WebKit::WebRect& rect);

virtual void updateGeometry(