Revert 65152 - Integrated Pepper3D v2 with the accelerated compositor.

- It now uses GGL instead of a child window.
- Fixed a bug where GLES2 decoder set texture state without updating TextureInfo.
- Fixed Pepper3D demos and added awesome 3D CSS programmer art.
- Removed ggl::GetCurrentContext to prevent further abuse. Fixed said abuse :)
- GGL exposes GLES2Implementation to allow issue of GL calls on a particular context without making that context globally current.
- Removed redundant "this context" argument from GGL SwapBuffers completion callback.
- Temporarily removed context lost notification. I need to figure out the best semantics.
TEST=Run Pepper3D and WebGL demos and YouTube videos on Windows and Mac.
BUG=none

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

TBR=apatrick@chromium.org
Review URL: http://codereview.chromium.org/4561001

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

1 files changed, 6 insertions, 12 deletions

diff --git a/chrome/renderer/ggl/ggl.h b/chrome/renderer/ggl/ggl.h
index 54a7f8e..1d53f57 100644
--- a/chrome/renderer/ggl/ggl.h
+++ b/chrome/renderer/ggl/ggl.h
@@ -18,12 +18,6 @@
 class GpuChannelHost;
 class MessageLoop;
 
-namespace gpu {
-namespace gles2 {
-class GLES2Implementation;
-}
-}
-
 namespace media {
 class VideoDecodeContext;
 class VideoDecodeEngine;
@@ -126,11 +120,15 @@ void DeleteParentTexture(Context* context, uint32 texture);
 
 // Provides a callback that will be invoked when SwapBuffers has completed
 // service side.
-void SetSwapBuffersCallback(Context* context, Callback0::Type* callback);
+void SetSwapBuffersCallback(Context* context,
+                            Callback1<Context*>::Type* callback);
 
 // Set the current GGL context for the calling thread.
 bool MakeCurrent(Context* context);
 
+// Get the calling thread's current GGL context.
+Context* GetCurrentContext();
+
 // For a view context, display everything that has been rendered since the
 // last call. For an offscreen context, resolve everything that has been
 // rendered since the last call to a copy that can be accessed by the parent
@@ -155,12 +153,8 @@ media::VideoDecodeContext* CreateVideoDecodeContext(Context* context,
 // TODO(gman): Remove this
 void DisableShaderTranslation(Context* context);
 
-// Allows direct access to the GLES2 implementation so a context
-// can be used without making it current.
-gpu::gles2::GLES2Implementation* GetImplementation(Context* context);
-
 // Return the current GGL error.
-Error GetError(Context* context);
+Error GetError();
 
 }  // namespace ggl