diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-17 20:18:17 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-17 20:18:17 +0000 |
commit | b4efc3807ee3e52550130f6495a36a60694575b1 (patch) | |
tree | b89b756dcf8ab23c4f8ab3b271d1ab04c3f22b39 /webkit/glue/plugins/pepper_webplugin_impl.h | |
parent | 8d5f6b1dcbaf5ed5276db88b7c59ba3e85d146ed (diff) | |
download | chromium_src-b4efc3807ee3e52550130f6495a36a60694575b1.zip chromium_src-b4efc3807ee3e52550130f6495a36a60694575b1.tar.gz chromium_src-b4efc3807ee3e52550130f6495a36a60694575b1.tar.bz2 |
Add some initial PP_Var <-> NPObject bindings.
This provides for basic access to the window and element containing the
instance. Enumeration of properties is not implemented.
R=brettw
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2075005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47444 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins/pepper_webplugin_impl.h')
-rw-r--r-- | webkit/glue/plugins/pepper_webplugin_impl.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/webkit/glue/plugins/pepper_webplugin_impl.h b/webkit/glue/plugins/pepper_webplugin_impl.h index 03e4145..e8ce265 100644 --- a/webkit/glue/plugins/pepper_webplugin_impl.h +++ b/webkit/glue/plugins/pepper_webplugin_impl.h @@ -10,6 +10,7 @@ #include "base/weak_ptr.h" #include "base/scoped_ptr.h" +#include "base/task.h" #include "gfx/rect.h" #include "third_party/WebKit/WebKit/chromium/public/WebPlugin.h" @@ -30,6 +31,10 @@ class WebPluginImpl : public WebKit::WebPlugin { WebKit::WebFrame* frame, const WebKit::WebPluginParams& params, const base::WeakPtr<PluginDelegate>& plugin_delegate); + + private: + friend class DeleteTask<WebPluginImpl>; + ~WebPluginImpl(); // WebKit::WebPlugin implementation. @@ -57,7 +62,6 @@ class WebPluginImpl : public WebKit::WebPlugin { void* notify_data, const WebKit::WebURLError& error); - public: struct InitData { scoped_refptr<PluginModule> module; base::WeakPtr<PluginDelegate> delegate; @@ -67,7 +71,6 @@ class WebPluginImpl : public WebKit::WebPlugin { scoped_ptr<InitData> init_data_; // Cleared upon successful initialization. scoped_refptr<PluginInstance> instance_; - WebKit::WebPluginContainer* container_; // Can be NULL. gfx::Rect plugin_rect_; DISALLOW_COPY_AND_ASSIGN(WebPluginImpl); |