Move swapcomplete callback into OutputSurface

Things like swap are concepts of an OutputSurface, not a context. Moving the
callbacks to OutputSurface will also reduce cc's knowledge of the context
guts and let us swap out the GL interface.

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=194394

Review URL: https://codereview.chromium.org/12545018

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

1 files changed, 5 insertions, 21 deletions

diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h
index b5f8a46..8023486 100644
--- a/cc/output/gl_renderer.h
+++ b/cc/output/gl_renderer.h
@@ -32,16 +32,11 @@ class GeometryBinding;
 class ScopedEnsureFramebufferAllocation;
 
 // Class that handles drawing of composited render layers using GL.
-class CC_EXPORT GLRenderer
-    : public DirectRenderer,
-      public NON_EXPORTED_BASE(
-          WebKit::WebGraphicsContext3D::
-              WebGraphicsSwapBuffersCompleteCallbackCHROMIUM),
-      public NON_EXPORTED_BASE(
-          WebKit::WebGraphicsContext3D::
-              WebGraphicsMemoryAllocationChangedCallbackCHROMIUM),
-      public NON_EXPORTED_BASE(
-          WebKit::WebGraphicsContext3D::WebGraphicsContextLostCallback) {
+class CC_EXPORT GLRenderer :
+    public DirectRenderer,
+    public NON_EXPORTED_BASE(
+        WebKit::WebGraphicsContext3D::
+            WebGraphicsMemoryAllocationChangedCallbackCHROMIUM) {
  public:
   static scoped_ptr<GLRenderer> Create(RendererClient* client,
                                        OutputSurface* output_surface,
@@ -56,9 +51,6 @@ class CC_EXPORT GLRenderer
 
   virtual void ViewportChanged() OVERRIDE;
 
-  virtual void ReceiveCompositorFrameAck(const CompositorFrameAck& ack)
-      OVERRIDE;
-
   // Waits for rendering to finish.
   virtual void Finish() OVERRIDE;
 
@@ -186,11 +178,6 @@ class CC_EXPORT GLRenderer
   void CleanupSharedObjects();
 
   // WebKit::
-  // WebGraphicsContext3D::WebGraphicsSwapBuffersCompleteCallbackCHROMIUM
-  // implementation.
-  virtual void onSwapBuffersComplete() OVERRIDE;
-
-  // WebKit::
   // WebGraphicsContext3D::WebGraphicsMemoryAllocationChangedCallbackCHROMIUM
   // implementation.
   virtual void onMemoryAllocationChanged(
@@ -199,9 +186,6 @@ class CC_EXPORT GLRenderer
   void EnsureBackbuffer();
   void EnforceMemoryPolicy();
 
-  // WebGraphicsContext3D::WebGraphicsContextLostCallback implementation.
-  virtual void onContextLost() OVERRIDE;
-
   RendererCapabilities capabilities_;
 
   unsigned offscreen_framebuffer_id_;