Move context-related callbacks into OutputSurface

cc/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_GL_RENDERER_H_
 #define CC_GL_RENDERER_H_
 
 #include "cc/cc_export.h"
 #include "cc/checkerboard_draw_quad.h"
 #include "cc/debug_border_draw_quad.h"
@@ skipping 13 matching lines @@
 
 class OutputSurface;
 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) {
+                             public NON_EXPORTED_BASE(WebKit::WebGraphicsContext3D::WebGraphicsMemoryAllocationChangedCallbackCHROMIUM) {
 public:
     static scoped_ptr<GLRenderer> create(RendererClient*, OutputSurface*, ResourceProvider*);
 
     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, const gfx::Rect&) OVERRIDE;
 
     virtual bool isContextLost() OVERRIDE;
@@ skipping 57 matching lines @@
 
     void copyTextureToFramebuffer(const DrawingFrame&, int textureId, const gfx::Rect&, const gfx::Transform& drawMatrix);
 
     bool useScopedTexture(DrawingFrame&, const ScopedResource*, const gfx::Rect& viewportRect);
 
     bool makeContextCurrent();
 
     bool initializeSharedObjects();
     void cleanupSharedObjects();
 
-    // WebKit::WebGraphicsContext3D::WebGraphicsSwapBuffersCompleteCallbackCHROMIUM implementation.
-    virtual void onSwapBuffersComplete() OVERRIDE;
-
     // WebKit::WebGraphicsContext3D::WebGraphicsMemoryAllocationChangedCallbackCHROMIUM implementation.
     virtual void onMemoryAllocationChanged(WebKit::WebGraphicsMemoryAllocation) OVERRIDE;
     void discardBackbuffer();
     void ensureBackbuffer();
     void enforceMemoryPolicy();
 
-    // WebGraphicsContext3D::WebGraphicsContextLostCallback implementation.
-    virtual void onContextLost() OVERRIDE;
-
     RendererCapabilities m_capabilities;
 
     unsigned m_offscreenFramebufferId;
 
     scoped_ptr<GeometryBinding> m_sharedGeometry;
     gfx::QuadF m_sharedGeometryQuad;
 
     // This block of bindings defines all of the programs used by the compositor itself.
 
     // Tiled layer shaders.
@@ skipping 98 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
 
 
 }
 
 #endif  // CC_GL_RENDERER_H_