PPAPI: move GLES2Implementation to PPAPI glue

This is in preparation for the proxy for the 3D interface.  In the proxy case,
we can't have the renderer access the command buffer directly, so we move the
command buffer helper instantiation there. A follow-up CL will make that
instantiation optional.

BUG=none
TEST=pepper flash

Review URL: http://codereview.chromium.org/6293023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72913 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 3 deletions

diff --git a/webkit/plugins/ppapi/ppb_context_3d_impl.h b/webkit/plugins/ppapi/ppb_context_3d_impl.h
index 9046368..e0fe036 100644
--- a/webkit/plugins/ppapi/ppb_context_3d_impl.h
+++ b/webkit/plugins/ppapi/ppb_context_3d_impl.h
@@ -12,6 +12,7 @@
 
 namespace gpu {
 namespace gles2 {
+class GLES2CmdHelper;
 class GLES2Implementation;
 }  // namespace gles2
 }  // namespace gpu
@@ -39,8 +40,12 @@ class PPB_Context3D_Impl : public Resource {
     return instance_;
   }
 
+  PluginDelegate::PlatformContext3D* platform_context() {
+    return platform_context_.get();
+  }
+
   gpu::gles2::GLES2Implementation* gles2_impl() {
-    return gles2_impl_;
+    return gles2_impl_.get();
   }
 
   int32_t BindSurfaces(PPB_Surface3D_Impl* draw,
@@ -55,8 +60,9 @@ class PPB_Context3D_Impl : public Resource {
   // PluginDelegate's 3D Context. Responsible for providing the command buffer.
   scoped_ptr<PluginDelegate::PlatformContext3D> platform_context_;
 
-  // GLES2 Implementation instance. Owned by the platform context's GGL context.
-  gpu::gles2::GLES2Implementation* gles2_impl_;
+  scoped_ptr<gpu::gles2::GLES2CmdHelper> helper_;
+  int32 transfer_buffer_id_;
+  scoped_ptr<gpu::gles2::GLES2Implementation> gles2_impl_;
 
   PPB_Surface3D_Impl* draw_surface_;
   PPB_Surface3D_Impl* read_surface_;