Move context-related callbacks into OutputSurface

cc/output/gl_renderer.h

 // Copyright 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_OUTPUT_GL_RENDERER_H_
 #define CC_OUTPUT_GL_RENDERER_H_
 
 #include "cc/base/cc_export.h"
 #include "cc/output/direct_renderer.h"
 #include "cc/output/gl_renderer_draw_cache.h"
@@ skipping 14 matching lines @@
 class GLRendererShaderTest;
 class OutputSurface;
 class PictureDrawQuad;
 class ScopedResource;
 class StreamVideoDrawQuad;
 class TextureDrawQuad;
 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,
                                        ResourceProvider* resource_provider,
                                        int highp_threshold_min);
 
   virtual ~GLRenderer();
 
   virtual const RendererCapabilities& Capabilities() const OVERRIDE;
 
   WebKit::WebGraphicsContext3D* Context();
 
   virtual void ViewportChanged() OVERRIDE;
 
-  virtual void ReceiveCompositorFrameAck(const CompositorFrameAck& ack)
-      OVERRIDE;
-
   // Waits for rendering to finish.
   virtual void Finish() OVERRIDE;
 
   virtual void DoNoOp() OVERRIDE;
   // Puts backbuffer onscreen.
   virtual bool SwapBuffers() OVERRIDE;
 
   virtual void GetFramebufferPixels(void* pixels, gfx::Rect rect) OVERRIDE;
 
   virtual bool IsContextLost() OVERRIDE;
@@ skipping 107 matching lines @@
   bool UseScopedTexture(DrawingFrame* frame,
                         const ScopedResource* resource,
                         gfx::Rect viewport_rect);
 
   bool MakeContextCurrent();
 
   bool InitializeSharedObjects();
   void CleanupSharedObjects();
 
   // WebKit::
-  // WebGraphicsContext3D::WebGraphicsSwapBuffersCompleteCallbackCHROMIUM
-  // implementation.
-  virtual void onSwapBuffersComplete() OVERRIDE;
-
-  // WebKit::
   // WebGraphicsContext3D::WebGraphicsMemoryAllocationChangedCallbackCHROMIUM
   // implementation.
   virtual void onMemoryAllocationChanged(
       WebKit::WebGraphicsMemoryAllocation allocation) OVERRIDE;
   void DiscardBackbuffer();
   void EnsureBackbuffer();
   void EnforceMemoryPolicy();
 
-  // WebGraphicsContext3D::WebGraphicsContextLostCallback implementation.
-  virtual void onContextLost() OVERRIDE;
-
   RendererCapabilities capabilities_;
 
   unsigned offscreen_framebuffer_id_;
 
   scoped_ptr<GeometryBinding> shared_geometry_;
   gfx::QuadF shared_geometry_quad_;
 
   // This block of bindings defines all of the programs used by the compositor
   // itself.  Add any new programs here to GLRendererShaderTest.
 
@@ skipping 186 matching lines @@
 #if DEBUG_GL_CALLS && !defined(NDEBUG)
 #define GLC(context, x)                                                        \
   (x, GLRenderer::DebugGLCall(&* context, #x, __FILE__, __LINE__))
 #else
 #define GLC(context, x) (x)
 #endif
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_GL_RENDERER_H_