summaryrefslogtreecommitdiffstats
path: root/webkit/tools/pepper_test_plugin/plugin_object.h
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/tools/pepper_test_plugin/plugin_object.h')
-rw-r--r--webkit/tools/pepper_test_plugin/plugin_object.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/webkit/tools/pepper_test_plugin/plugin_object.h b/webkit/tools/pepper_test_plugin/plugin_object.h
index 0da3722b..0850f54 100644
--- a/webkit/tools/pepper_test_plugin/plugin_object.h
+++ b/webkit/tools/pepper_test_plugin/plugin_object.h
@@ -30,7 +30,8 @@
#include "base/scoped_ptr.h"
#include "webkit/glue/plugins/nphostapi.h"
#if !defined(INDEPENDENT_PLUGIN)
-#include "gpu/pgl/pgl.h"
+#include "gpu/command_buffer/client/gles2_implementation.h"
+#include "webkit/tools/pepper_test_plugin/command_buffer_pepper.h"
#endif
extern NPNetscapeFuncs* browser;
@@ -50,21 +51,22 @@ class PluginObject {
void Draw3D();
private:
+ bool InitializeCommandBuffer();
+
NPObject header_;
NPP npp_;
NPObject* test_object_;
int dimensions_;
NPDevice* device2d_;
- NPDevice* device3d_;
NPDevice* deviceaudio_;
- NPDeviceContext3D context3d_;
NPDeviceContextAudio context_audio_;
-
#if !defined(INDEPENDENT_PLUGIN)
- PGLContext pgl_context_;
+ scoped_ptr<CommandBufferPepper> command_buffer_;
+ scoped_ptr<gpu::gles2::GLES2CmdHelper> helper_;
+ scoped_ptr<gpu::gles2::GLES2Implementation> gles2_implementation_;
#endif
int width_;