Move context-related callbacks into OutputSurface

cc/output/output_surface.cc

 // Copyright (c) 2013 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.
 
 #include "cc/output/output_surface.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/strings/string_split.h"
+#include "cc/output/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"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
 using std::set;
 using std::string;
 using std::vector;
 
 namespace cc {
 
+class OutputSurfaceCallbacks :
+  public WebKit::WebGraphicsContext3D::WebGraphicsSwapBuffersCompleteCallbackCHROMIUM,

[enne (OOO), 2013/03/25 18:29:19]

style nit: 80 col.  ;)

+  public WebKit::WebGraphicsContext3D::WebGraphicsContextLostCallback {
+ public:
+   explicit OutputSurfaceCallbacks(OutputSurfaceClient* client)
+     : client_(client) {}

[enne (OOO), 2013/03/25 18:29:19]

style nit: four space indent.

+
+   // 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),
       context3d_(context3d.Pass()),
       has_gl_discard_backbuffer_(false) {
 }
 
 OutputSurface::OutputSurface(
     scoped_ptr<cc::SoftwareOutputDevice> software_device)
     : client_(NULL),
@@ skipping 23 matching lines @@
     return false;
 
   string extensionsString = UTF16ToASCII(context3d_->getString(GL_EXTENSIONS));
   vector<string> extensionsList;
   base::SplitString(extensionsString, ' ', &extensionsList);
   set<string> extensions(extensionsList.begin(), extensionsList.end());
 
   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;
 }
 
 void OutputSurface::SendFrameToParentCompositor(CompositorFrame*) {
   NOTIMPLEMENTED();
 }
 
 void OutputSurface::EnsureBackbuffer() {
   DCHECK(context3d_);
   if (has_gl_discard_backbuffer_)
@@ skipping 23 matching lines @@
   context3d_->prepareTexture();
 }
 
 void OutputSurface::PostSubBuffer(gfx::Rect rect) {
   DCHECK(context3d_);
   context3d_->postSubBufferCHROMIUM(
       rect.x(), rect.y(), rect.width(), rect.height());
 }
 
 }  // namespace cc