cc: Emulate BeginFrame in OutputSurfaces that don't support it natively

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 106 matching lines @@
 }
 
 void SynchronousCompositorOutputSurface::Reshape(
     gfx::Size size, float scale_factor) {
   // Intentional no-op: surface size is controlled by the embedder.
 }
 
 void SynchronousCompositorOutputSurface::SetNeedsBeginFrame(
     bool enable) {
   DCHECK(CalledOnValidThread());
+  cc::OutputSurface::SetNeedsBeginFrame(enable);
   needs_begin_frame_ = enable;
   SynchronousCompositorOutputSurfaceDelegate* delegate = GetDelegate();
   if (delegate)
     delegate->SetContinuousInvalidate(needs_begin_frame_);
 }
 
 void SynchronousCompositorOutputSurface::SwapBuffers(
     cc::CompositorFrame* frame) {
   if (!ForcedDrawToSoftwareDevice()) {
     DCHECK(context3d());
     context3d()->shallowFlushCHROMIUM();
   }
   // TODO(joth): Route page scale to the client, see http://crbug.com/237006
   did_swap_buffer_ = true;
+  DidSwapBuffers();
 }
 
 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
 
 bool SynchronousCompositorOutputSurface::InitializeHwDraw() {
   DCHECK(CalledOnValidThread());
-  DCHECK(client_);
+  DCHECK(HasClient());
   DCHECK(!context3d_);
 
   // TODO(boliu): Get a context provider in constructor and pass here.
   return InitializeAndSetContext3D(CreateWebGraphicsContext3D().Pass(),
                                    scoped_refptr<cc::ContextProvider>());
 }
 
 bool SynchronousCompositorOutputSurface::DemandDrawHw(
     gfx::Size surface_size,
     const gfx::Transform& transform,
     gfx::Rect clip) {
   DCHECK(CalledOnValidThread());
-  DCHECK(client_);
+  DCHECK(HasClient());
   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);
 
   gfx::Transform adjusted_transform = transform;
   AdjustTransformForClip(&adjusted_transform, clip);
   surface_size_ = surface_size;
-  client_->SetExternalDrawConstraints(adjusted_transform, clip);
+  SetExternalDrawConstraints(adjusted_transform, clip);
   InvokeComposite(clip.size());
 
   // TODO(boliu): Check if context is lost here.
 
   return did_swap_buffer_;
 }
 
 bool SynchronousCompositorOutputSurface::DemandDrawSw(SkCanvas* canvas) {
   DCHECK(CalledOnValidThread());
   DCHECK(canvas);
   DCHECK(!current_sw_canvas_);
   current_sw_canvas_ = canvas;
 
   SkIRect canvas_clip;
   canvas->getClipDeviceBounds(&canvas_clip);
   gfx::Rect clip = gfx::SkIRectToRect(canvas_clip);
 
   gfx::Transform transform(gfx::Transform::kSkipInitialization);
   transform.matrix() = canvas->getTotalMatrix();  // Converts 3x3 matrix to 4x4.
   AdjustTransformForClip(&transform, clip);
 
   surface_size_ = gfx::Size(canvas->getDeviceSize().width(),
                             canvas->getDeviceSize().height());
-  client_->SetExternalDrawConstraints(transform, clip);
+  SetExternalDrawConstraints(transform, clip);
 
   InvokeComposite(clip.size());
 
   current_sw_canvas_ = NULL;
   return did_swap_buffer_;
 }
 
 void SynchronousCompositorOutputSurface::InvokeComposite(
     gfx::Size damage_size) {
   did_swap_buffer_ = false;
-  client_->SetNeedsRedrawRect(gfx::Rect(damage_size));
+  SetNeedsRedrawRect(gfx::Rect(damage_size));
   if (needs_begin_frame_)
-    client_->BeginFrame(base::TimeTicks::Now());
+    BeginFrame(base::TimeTicks::Now());
 
   if (did_swap_buffer_)
-    client_->OnSwapBuffersComplete(NULL);
+    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