summaryrefslogtreecommitdiffstats
path: root/webkit/tools/pepper_test_plugin/plugin_object.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-01 23:07:02 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-01 23:07:02 +0000
commit66b4e8dfc5cce75c998889d5b968ecb72a204447 (patch)
tree215d020b5bb8a5cfa43debf580e9bd3d55091b77 /webkit/tools/pepper_test_plugin/plugin_object.h
parent3984b4b1edee2b14b0ebd41d31fc9fedfc7a0ef9 (diff)
downloadchromium_src-66b4e8dfc5cce75c998889d5b968ecb72a204447.zip
chromium_src-66b4e8dfc5cce75c998889d5b968ecb72a204447.tar.gz
chromium_src-66b4e8dfc5cce75c998889d5b968ecb72a204447.tar.bz2
Update the Pepper APIs to the latest spec for the 2D demo plugin.
This also adds the npapi headers to the npapi.gyp file since I got tired of Visual Studio not finding the files. This removes the "open file in sandbox" feature which it doesn't look like we will use. One more significant change is that I changed to including pepper.h in all cases, even when pepper is disabled. We used to have a forward declare in npapi.h for the structs in question, but we'll be adding a lot more structs for the different contexts and I don't think this will scale. I think its OK fo rthe pepper API declarations to be available when Pepper isn't enabled. BUT=none TEST=none Review URL: http://codereview.chromium.org/453015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33501 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/pepper_test_plugin/plugin_object.h')
-rw-r--r--webkit/tools/pepper_test_plugin/plugin_object.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/tools/pepper_test_plugin/plugin_object.h b/webkit/tools/pepper_test_plugin/plugin_object.h
index a45bdc4..1dcbb80 100644
--- a/webkit/tools/pepper_test_plugin/plugin_object.h
+++ b/webkit/tools/pepper_test_plugin/plugin_object.h
@@ -49,6 +49,8 @@ class PluginObject {
NPP npp_;
NPObject* test_object_;
+ NPDevice* device2d_;
+
gfx::Size size_;
DISALLOW_COPY_AND_ASSIGN(PluginObject);