Move context-related callbacks into OutputSurface

cc/gl_renderer.h

Index: cc/gl_renderer.h
diff --git a/cc/gl_renderer.h b/cc/gl_renderer.h
index 750530dd384085dc0f592671e188d74cf979e459..73ddaa8d1e9c480ff203d45a4fcf639bab397586 100644
--- a/cc/gl_renderer.h
+++ b/cc/gl_renderer.h
@@ -31,9 +31,7 @@ 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*);
 
@@ -45,8 +43,6 @@ public:
 
     virtual void viewportChanged() OVERRIDE;
 
-    virtual void receiveCompositorFrameAck(const CompositorFrameAck& ack) OVERRIDE;
-
     // waits for rendering to finish
     virtual void finish() OVERRIDE;
 
@@ -124,18 +120,12 @@ private:
     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;