Unified OutputSurface::SwapBuffers.

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/compositor_frame.h"
 #include "cc/output/output_surface_client.h"
 #include "third_party/WebKit/public/platform/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,
       public WebKit::WebGraphicsContext3D::WebGraphicsContextLostCallback {
  public:
   explicit OutputSurfaceCallbacks(OutputSurfaceClient* client)
       : client_(client) {
     DCHECK(client_);
   }
 
   // WK:WGC3D::WGSwapBuffersCompleteCallbackCHROMIUM implementation.
-  virtual void onSwapBuffersComplete() { client_->OnSwapBuffersComplete(); }
+  virtual void onSwapBuffersComplete() { client_->OnSwapBuffersComplete(NULL); }
 
   // 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),
+      has_swap_buffers_complete_callback_(false),
       device_scale_factor_(-1) {
 }
 
 OutputSurface::OutputSurface(
     scoped_ptr<cc::SoftwareOutputDevice> software_device)
     : client_(NULL),
       software_device_(software_device.Pass()),
       has_gl_discard_backbuffer_(false),
+      has_swap_buffers_complete_callback_(false),
       device_scale_factor_(-1) {
 }
 
 OutputSurface::OutputSurface(
     scoped_ptr<WebKit::WebGraphicsContext3D> context3d,
     scoped_ptr<cc::SoftwareOutputDevice> software_device)
     : client_(NULL),
       context3d_(context3d.Pass()),
       software_device_(software_device.Pass()),
       has_gl_discard_backbuffer_(false),
+      has_swap_buffers_complete_callback_(false),
       device_scale_factor_(-1) {
 }
 
 OutputSurface::~OutputSurface() {
 }
 
 bool OutputSurface::ForcedDrawToSoftwareDevice() const {
   return false;
 }
 
@@ skipping 42 matching lines @@
   DCHECK(!context3d_);
   DCHECK(context3d);
   DCHECK(client_);
 
   string extensions_string = UTF16ToASCII(context3d->getString(GL_EXTENSIONS));
   vector<string> extensions_list;
   base::SplitString(extensions_string, ' ', &extensions_list);
   set<string> extensions(extensions_list.begin(), extensions_list.end());
   has_gl_discard_backbuffer_ =
       extensions.count("GL_CHROMIUM_discard_backbuffer") > 0;
+  has_swap_buffers_complete_callback_ =
+       extensions.count("GL_CHROMIUM_swapbuffers_complete_callback") > 0;
+
 
   context3d_ = context3d.Pass();
   callbacks_.reset(new OutputSurfaceCallbacks(client_));
   context3d_->setSwapBuffersCompleteCallbackCHROMIUM(callbacks_.get());
   context3d_->setContextLostCallback(callbacks_.get());
 }
 
-void OutputSurface::SendFrameToParentCompositor(CompositorFrame* frame) {
-  NOTIMPLEMENTED();
-}
-
 void OutputSurface::EnsureBackbuffer() {
   DCHECK(context3d_);
   if (has_gl_discard_backbuffer_)
     context3d_->ensureBackbufferCHROMIUM();
 }
 
 void OutputSurface::DiscardBackbuffer() {
   DCHECK(context3d_);
   if (has_gl_discard_backbuffer_)
     context3d_->discardBackbufferCHROMIUM();
 }
 
 void OutputSurface::Reshape(gfx::Size size, float scale_factor) {
   if (size == surface_size_ && scale_factor == device_scale_factor_)
     return;
 
   surface_size_ = size;
   device_scale_factor_ = scale_factor;
   if (context3d_) {
     context3d_->reshapeWithScaleFactor(
         size.width(), size.height(), scale_factor);
   }
+  if (software_device_)
+    software_device_->Resize(size);
 }
 
 gfx::Size OutputSurface::SurfaceSize() const {
   return surface_size_;
 }
 
 void OutputSurface::BindFramebuffer() {
   DCHECK(context3d_);
   context3d_->bindFramebuffer(GL_FRAMEBUFFER, 0);
 }
 
-void OutputSurface::SwapBuffers(const ui::LatencyInfo& latency_info) {
+void OutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
   DCHECK(context3d_);
-  // Note that currently this has the same effect as SwapBuffers; we should
-  // consider exposing a different entry point on WebGraphicsContext3D.
-  context3d_->prepareTexture();
-}
+  DCHECK(frame->gl_frame_data);
 
-void OutputSurface::PostSubBuffer(gfx::Rect rect,
-                                  const ui::LatencyInfo& latency_info) {
-  DCHECK(context3d_);
-  context3d_->postSubBufferCHROMIUM(
-      rect.x(), rect.y(), rect.width(), rect.height());
+  gfx::Rect sub_buffer_rect = frame->gl_frame_data->sub_buffer_rect;
+  if (!sub_buffer_rect.IsEmpty()) {
+    context3d()->postSubBufferCHROMIUM(sub_buffer_rect.x(),
+                                       sub_buffer_rect.y(),
+                                       sub_buffer_rect.width(),
+                                       sub_buffer_rect.height());
+  } else {
+    // Note that currently this has the same effect as SwapBuffers; we should
+    // consider exposing a different entry point on WebGraphicsContext3D.
+    context3d()->prepareTexture();
+  }

[joth, 2013/06/10 18:43:32]

fwiw, I found I had to wrap this lot in "if context3d_" (and remove the DCHECK)
to have the SW renderer LTHI unit tests not timeout, as they will now need the
OnSwapBuffersComplete() below.

The alternative is write a dedicated FakeOutputSurface (just adds test
clutter?), or a deeper refactoring of this class to make context3d  optional by
design which is probably a nice idea, but beyond scope of this patch.

[aelias_OOO_until_Jul13, 2013/06/10 18:57:57]

cc_unittests package is already passing as of Patch Set 2.  It did need some
extra logic in FakeOutputSurface.  I agree the OutputSurface hierarchy needs
more refactoring but it was biting off too much to try to add that to this
patch.

[joth, 2013/06/10 19:04:49]

oh yes! Nice. I totally missed that somehow :)

+
+  if (client_ && !has_swap_buffers_complete_callback_)
+    client_->OnSwapBuffersComplete(NULL);
 }
 
 }  // namespace cc