cc: Make scheduling be driven by vsync for android webview.

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 55ddf30d5941ecc9118a8e5c9011ca1a87f571dc..69a8cdf38bc3b5f0a56f0ad72a24c74b34aa47c6 100644
--- a/content/browser/android/in_process/synchronous_compositor_output_surface.cc
+++ b/content/browser/android/in_process/synchronous_compositor_output_surface.cc
@@ -73,9 +73,7 @@ SynchronousCompositorOutputSurface::SynchronousCompositorOutputSurface(
       registered_(false),
       current_sw_canvas_(nullptr),
       memory_policy_(0),
-      output_surface_client_(nullptr),
-      frame_swap_message_queue_(frame_swap_message_queue),
-      begin_frame_source_(nullptr) {
+      frame_swap_message_queue_(frame_swap_message_queue) {
   capabilities_.deferred_gl_initialization = true;
   capabilities_.draw_and_swap_full_viewport_every_frame = true;
   capabilities_.adjust_deadline_for_parent = false;
@@ -91,7 +89,6 @@ SynchronousCompositorOutputSurface::~SynchronousCompositorOutputSurface() {
     SynchronousCompositorRegistry::GetInstance()->UnregisterOutputSurface(
         routing_id_, this);
   }
-  DCHECK(!begin_frame_source_);
 }
 
 bool SynchronousCompositorOutputSurface::BindToClient(
@@ -100,8 +97,7 @@ bool SynchronousCompositorOutputSurface::BindToClient(
   if (!cc::OutputSurface::BindToClient(surface_client))
     return false;
 
-  output_surface_client_ = surface_client;
-  output_surface_client_->SetMemoryPolicy(memory_policy_);
+  client_->SetMemoryPolicy(memory_policy_);
 
   SynchronousCompositorRegistry::GetInstance()->RegisterOutputSurface(
       routing_id_, this);
@@ -125,9 +121,10 @@ void SynchronousCompositorOutputSurface::SwapBuffers(
   client_->DidSwapBuffers();
 }
 
-void SynchronousCompositorOutputSurface::SetBeginFrameSource(
-    SynchronousCompositorExternalBeginFrameSource* begin_frame_source) {
-  begin_frame_source_ = begin_frame_source;
+void SynchronousCompositorOutputSurface::Invalidate() {
+  DCHECK(CalledOnValidThread());
+  if (!invalidate_callback_.is_null())
+    invalidate_callback_.Run();
 }
 
 namespace {
@@ -212,7 +209,6 @@ void SynchronousCompositorOutputSurface::InvokeComposite(
     gfx::Transform transform_for_tile_priority,
     bool hardware_draw) {
   DCHECK(!frame_holder_.get());
-  DCHECK(begin_frame_source_);
 
   gfx::Transform adjusted_transform = transform;
   AdjustTransform(&adjusted_transform, viewport);
@@ -224,7 +220,7 @@ void SynchronousCompositorOutputSurface::InvokeComposite(
                              !hardware_draw);
   SetNeedsRedrawRect(gfx::Rect(viewport.size()));
 
-  begin_frame_source_->BeginFrame();
+  client_->RequestDraw();
 
   // After software draws (which might move the viewport arbitrarily), restore
   // the previous hardware viewport to allow CC's tile manager to prioritize
@@ -260,8 +256,13 @@ void SynchronousCompositorOutputSurface::SetMemoryPolicy(size_t bytes_limit) {
   memory_policy_.bytes_limit_when_visible = bytes_limit;
   memory_policy_.num_resources_limit = kNumResourcesLimit;
 
-  if (output_surface_client_)
-    output_surface_client_->SetMemoryPolicy(memory_policy_);
+  if (client_)
+    client_->SetMemoryPolicy(memory_policy_);
+}
+
+void SynchronousCompositorOutputSurface::SetInvalidateCallback(
+    const base::Closure& callback) {
+  invalidate_callback_ = callback;
 }
 
 void SynchronousCompositorOutputSurface::SetTreeActivationCallback(