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 69b99140f2007c1a01813c6ba868dbbea13cfcfa..01a09dfb913923eb619b647f41b32f6edfe0b9fd 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:
@@ -97,6 +98,8 @@ class CC_EXPORT OutputSurface : public WebKit::WebCompositorOutputSurface {
   scoped_ptr<cc::SoftwareOutputDevice> software_device_;
   bool has_gl_discard_backbuffer_;
 
+  scoped_ptr<OutputSurfaceCallbacks> callbacks_;

[piman, 2013/03/08 05:11:56]

nit: we probably want to have the callbacks outlive the context (i.e. a few
lines higher), just in case the context calls it at destruction.

+
  private:
   DISALLOW_COPY_AND_ASSIGN(OutputSurface);
 };