Move context-related callbacks into OutputSurface

cc/output_surface.cc

Index: cc/output_surface.cc
diff --git a/cc/output_surface.cc b/cc/output_surface.cc
index d1da25c1a25e90dd39a7f05381de03ceff0781ee..bb471090089c1416100ca5ea3efb41ec4e938ca7 100644
--- a/cc/output_surface.cc
+++ b/cc/output_surface.cc
@@ -11,6 +11,7 @@
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/strings/string_split.h"
+#include "cc/output_surface_client.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
@@ -23,6 +24,27 @@ using std::vector;
 
 namespace cc {
 
+class OutputSurfaceCallbacks :
+  public WebKit::WebGraphicsContext3D::WebGraphicsSwapBuffersCompleteCallbackCHROMIUM,
+  public WebKit::WebGraphicsContext3D::WebGraphicsContextLostCallback {
+ public:
+   explicit OutputSurfaceCallbacks(OutputSurfaceClient* client)
+     : client_(client) {}
+
+   // WK:WGC3D::WGSwapBuffersCompleteCallbackCHROMIUM implementation.
+   virtual void onSwapBuffersComplete() {
+     client_->OnSwapBuffersComplete();
+   }
+
+   // WK:WGC3D::WGContextLostCallback implementation.
+   virtual void onContextLost() {
+     client_->DidLoseOutputSurface();
+   }
+
+ private:
+  OutputSurfaceClient* client_;
+};
+
 OutputSurface::OutputSurface(
     scoped_ptr<WebKit::WebGraphicsContext3D> context3d)
     : client_(NULL),
@@ -66,6 +88,10 @@ bool OutputSurface::BindToClient(
   has_gl_discard_backbuffer_ =
       extensions.count("GL_CHROMIUM_discard_backbuffer");
 
+  callbacks_.reset(new OutputSurfaceCallbacks(client_));
+  context3d_->setSwapBuffersCompleteCallbackCHROMIUM(callbacks_.get());
+  context3d_->setContextLostCallback(callbacks_.get());
+
   return true;
 }