Move context-related callbacks into OutputSurface

cc/output_surface.h

Index: cc/output_surface.h
diff --git a/cc/output_surface.h b/cc/output_surface.h
index f128dc2d226a2ac18deb5651f96e9badb1d8f8ae..b5461853d2371028477c6d80527635effa25238c 100644
--- a/cc/output_surface.h
+++ b/cc/output_surface.h
@@ -23,6 +23,7 @@ namespace cc {
 
 class CompositorFrame;
 class OutputSurfaceClient;
+class OutputSurfaceCallbacks;
 
 // Represents the output surface for a compositor. The compositor owns
 // and manages its destruction. Its lifetime is:
@@ -73,6 +74,12 @@ class CC_EXPORT OutputSurface : public WebKit::WebCompositorOutputSurface {
   // thread.
   virtual bool BindToClient(OutputSurfaceClient*);
 
+  // Registers for callbacks from the context/device. Should be called only
+  // after the context/device is fully initialized and cleared before
+  // destroying it.
+  void RegisterCallbacks();
+  void ClearCallbacks();

[piman, 2013/03/15 03:20:38]

This isn't called anywhere (that I can see?)

+
   // Sends frame data to the parent compositor. This should only be called when
   // capabilities().has_parent_compositor. The implementation may destroy or
   // steal the contents of the CompositorFrame passed in.
@@ -99,6 +106,8 @@ class CC_EXPORT OutputSurface : public WebKit::WebCompositorOutputSurface {
   scoped_ptr<cc::SoftwareOutputDevice> software_device_;
   bool has_gl_discard_backbuffer_;
 
+  scoped_ptr<OutputSurfaceCallbacks> callbacks_;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(OutputSurface);
 };