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

content/browser/android/in_process/synchronous_compositor_output_surface.cc

Index: content/browser/android/in_process/synchronous_compositor_output_surface.cc
diff --git a/content/browser/android/in_process/synchronous_compositor_output_surface.cc b/content/browser/android/in_process/synchronous_compositor_output_surface.cc
index 7613168adfd70901b16776a56a58c042b8d6bdaf..251e6ddee97e07e2f910a2c9097c1c774dac558d 100644
--- a/content/browser/android/in_process/synchronous_compositor_output_surface.cc
+++ b/content/browser/android/in_process/synchronous_compositor_output_surface.cc
@@ -124,6 +124,7 @@ void SynchronousCompositorOutputSurface::Reshape(
 void SynchronousCompositorOutputSurface::SetNeedsBeginFrame(
     bool enable) {
   DCHECK(CalledOnValidThread());
+  cc::OutputSurface::SetNeedsBeginFrame(enable);
   needs_begin_frame_ = enable;
   SynchronousCompositorOutputSurfaceDelegate* delegate = GetDelegate();
   if (delegate)
@@ -138,6 +139,7 @@ void SynchronousCompositorOutputSurface::SwapBuffers(
   }
   // TODO(joth): Route page scale to the client, see http://crbug.com/237006
   did_swap_buffer_ = true;
+  DidSwapBuffers();
 }
 
 namespace {
@@ -150,7 +152,7 @@ void AdjustTransformForClip(gfx::Transform* transform, gfx::Rect clip) {
 
 bool SynchronousCompositorOutputSurface::InitializeHwDraw() {
   DCHECK(CalledOnValidThread());
-  DCHECK(client_);
+  DCHECK(HasClient());
   DCHECK(!context3d_);
 
   // TODO(boliu): Get a context provider in constructor and pass here.
@@ -163,7 +165,7 @@ bool SynchronousCompositorOutputSurface::DemandDrawHw(
     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.
@@ -177,7 +179,7 @@ bool SynchronousCompositorOutputSurface::DemandDrawHw(
   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.
@@ -201,7 +203,7 @@ bool SynchronousCompositorOutputSurface::DemandDrawSw(SkCanvas* canvas) {
 
   surface_size_ = gfx::Size(canvas->getDeviceSize().width(),
                             canvas->getDeviceSize().height());
-  client_->SetExternalDrawConstraints(transform, clip);
+  SetExternalDrawConstraints(transform, clip);
 
   InvokeComposite(clip.size());
 
@@ -212,12 +214,12 @@ bool SynchronousCompositorOutputSurface::DemandDrawSw(SkCanvas* canvas) {
 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