Unified OutputSurface::SwapBuffers.

content/browser/android/in_process/synchronous_compositor_output_surface.cc

 // Copyright 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 "content/browser/android/in_process/synchronous_compositor_output_surface.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/time.h"
 #include "cc/output/compositor_frame.h"
@@ skipping 41 matching lines @@
  public:
   SoftwareDevice(SynchronousCompositorOutputSurface* surface)
     : surface_(surface),
       null_device_(SkBitmap::kARGB_8888_Config, 1, 1),
       null_canvas_(&null_device_) {
   }
   virtual void Resize(gfx::Size size) OVERRIDE {
     // Intentional no-op: canvas size is controlled by the embedder.
   }
   virtual SkCanvas* BeginPaint(gfx::Rect damage_rect) OVERRIDE {
-    DCHECK(surface_->current_sw_canvas_);
-    if (surface_->current_sw_canvas_)
-      return surface_->current_sw_canvas_;
-    return &null_canvas_;
+    if (!surface_->current_sw_canvas_) {
+      NOTREACHED() << "BeginPaint with no canvas set";
+      return &null_canvas_;
+    }
+    LOG_IF(WARNING, surface_->did_swap_buffer_)
+        << "Mutliple calls to BeginPaint per frame";
+    return surface_->current_sw_canvas_;
   }
   virtual void EndPaint(cc::SoftwareFrameData* frame_data) OVERRIDE {
-    surface_->current_sw_canvas_ = NULL;
   }
   virtual void CopyToBitmap(gfx::Rect rect, SkBitmap* output) OVERRIDE {
     NOTIMPLEMENTED();
   }
 
  private:
   SynchronousCompositorOutputSurface* surface_;
   SkDevice null_device_;
   SkCanvas null_canvas_;
 
@@ skipping 33 matching lines @@
   if (delegate)
     delegate->DidBindOutputSurface(this);
   return true;
 }
 
 void SynchronousCompositorOutputSurface::Reshape(
     gfx::Size size, float scale_factor) {
   // Intentional no-op: surface size is controlled by the embedder.
 }
 
-void SynchronousCompositorOutputSurface::SendFrameToParentCompositor(
-    cc::CompositorFrame* frame) {
-  NOTREACHED();
-  // TODO(joth): Route page scale to the client, see http://crbug.com/237006
-}
-
 void SynchronousCompositorOutputSurface::SetNeedsBeginFrame(
     bool enable) {
   DCHECK(CalledOnValidThread());
   needs_begin_frame_ = enable;
   SynchronousCompositorOutputSurfaceDelegate* delegate = GetDelegate();
   if (delegate)
     delegate->SetContinuousInvalidate(needs_begin_frame_);
 }
 
 void SynchronousCompositorOutputSurface::SwapBuffers(
-    const ui::LatencyInfo& info) {
-  context3d()->shallowFlushCHROMIUM();
+    cc::CompositorFrame* frame) {
+  if (!ForcedDrawToSoftwareDevice()) {
+    DCHECK(context3d());
+    context3d()->shallowFlushCHROMIUM();
+  }
   did_swap_buffer_ = true;

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

// TODO(joth): Route page scale to the client, see http://crbug.com/237006

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

Done.

 }
 
 namespace {
 void AdjustTransformForClip(gfx::Transform* transform, gfx::Rect clip) {
   // The system-provided transform translates us from the screen origin to the
   // origin of the clip rect, but CC's draw origin starts at the clip.
   transform->matrix().postTranslate(-clip.x(), -clip.y(), 0);
 }
 } // namespace
 
@@ skipping 16 matching lines @@
   DCHECK(context3d());
 
   // Force a GL state restore next time a GLContextVirtual is made current.
   // TODO(boliu): Move this to the end of this function after we have fixed
   // all cases of MakeCurrent calls outside of draws. Tracked in
   // crbug.com/239856.
   gfx::GLContext* current_context = gfx::GLContext::GetCurrent();
   if (current_context)
     current_context->ReleaseCurrent(NULL);
 
-  did_swap_buffer_ = false;
-
   gfx::Transform adjusted_transform = transform;
   AdjustTransformForClip(&adjusted_transform, clip);
   surface_size_ = surface_size;
   client_->SetExternalDrawConstraints(adjusted_transform, clip);
   InvokeComposite(clip.size());
 
   // TODO(boliu): Check if context is lost here.
 
   return did_swap_buffer_;
 }
@@ skipping 18 matching lines @@
 
   InvokeComposite(clip.size());
 
   bool finished_draw = current_sw_canvas_ == NULL;
   current_sw_canvas_ = NULL;
   return finished_draw;
 }
 
 void SynchronousCompositorOutputSurface::InvokeComposite(
     gfx::Size damage_size) {
+  did_swap_buffer_ = false;
   client_->SetNeedsRedrawRect(gfx::Rect(damage_size));
   if (needs_begin_frame_)
     client_->BeginFrame(base::TimeTicks::Now());
+
+  if (did_swap_buffer_)
+    client_->OnSwapBuffersComplete(NULL);
 }
 
 // Not using base::NonThreadSafe as we want to enforce a more exacting threading
 // requirement: SynchronousCompositorOutputSurface() must only be used on the UI
 // thread.
 bool SynchronousCompositorOutputSurface::CalledOnValidThread() const {
   return BrowserThread::CurrentlyOn(BrowserThread::UI);
 }
 
 SynchronousCompositorOutputSurfaceDelegate*
 SynchronousCompositorOutputSurface::GetDelegate() {
   return SynchronousCompositorImpl::FromRoutingID(routing_id_);
 }
 
 }  // namespace content