Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Unified Diff: webkit/tools/pepper_test_plugin/plugin_object.h

Issue 550048: Revert 36268 - Implemented PGL library, an EGL like API for Pepper. Updated P... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 11 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
Index: webkit/tools/pepper_test_plugin/plugin_object.h
===================================================================
--- webkit/tools/pepper_test_plugin/plugin_object.h (revision 36269)
+++ webkit/tools/pepper_test_plugin/plugin_object.h (working copy)
@@ -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 @@
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_;
« no previous file with comments | « webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp ('k') | webkit/tools/pepper_test_plugin/plugin_object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698