Make SingleThreadProxy a SchedulerClient

content/browser/renderer_host/compositor_impl_android.cc

Index: content/browser/renderer_host/compositor_impl_android.cc
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index 6232bcdb434467966c7e2ba5b0d99ad07063a930..3ad4a03c22b4d5d93bd039b1b4ef7df662787d7b 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -195,7 +195,6 @@ CompositorImpl::CompositorImpl(CompositorClient* client,
       client_(client),
       root_window_(root_window),
       did_post_swapbuffers_(false),
-      ignore_schedule_composite_(false),
       needs_composite_(false),
       needs_animate_(false),
       will_composite_immediately_(false),
@@ -310,10 +309,7 @@ void CompositorImpl::Composite(CompositingTrigger trigger) {
   current_composite_task_->Cancel();
   DCHECK(DidCompositeThisFrame() && !WillComposite());
 
-  // Ignore ScheduleComposite() from layer tree changes during layout and
-  // animation updates that will already be reflected in the current frame
-  // we are about to draw.
-  ignore_schedule_composite_ = true;
+  host_->SetDeferCommits(true);

[no sievers, 2014/06/13 21:25:43]

I'm slightly worried that during client_->Layout() below, where the tab stack
syncs its internal representation of the UI with the cc layer tree, we somehow
end up redundantly touching some layer property which keeps us compositing
continuously.

Is it also possible to ignore 'set needs commit'? Otherwise maybe we can come up
with some sort of DCHECK() in the app that if no properties changed in the
original representation we don't end up with a 'needs commit' from the call to
Layout().

[danakj, 2014/06/13 21:41:54]

FWIW You could run with the --strict-layer-property-change-checking flag that
would cause dchecks when this happens.

   client_->Layout();
 
   const base::TimeTicks frame_time = gfx::FrameTime::Now();
@@ -321,7 +317,7 @@ void CompositorImpl::Composite(CompositingTrigger trigger) {
     needs_animate_ = false;
     root_window_->Animate(frame_time);
   }
-  ignore_schedule_composite_ = false;
+  host_->SetDeferCommits(false);
 
   did_post_swapbuffers_ = false;
   host_->Composite(frame_time);
@@ -534,31 +530,6 @@ void CompositorImpl::OnLostResources() {
   ui_resource_provider_.UIResourcesAreInvalid();
 }
 
-void CompositorImpl::ScheduleComposite() {
-  DCHECK(!needs_composite_ || WillComposite());
-  if (ignore_schedule_composite_)
-    return;
-
-  needs_composite_ = true;
-  // We currently expect layer tree invalidations at most once per frame
-  // during normal operation and therefore try to composite immediately
-  // to minimize latency.
-  PostComposite(COMPOSITE_IMMEDIATELY);
-}
-
-void CompositorImpl::ScheduleAnimation() {
-  DCHECK(!needs_animate_ || needs_composite_);
-  DCHECK(!needs_composite_ || WillComposite());
-  needs_animate_ = true;
-
-  if (needs_composite_)
-    return;
-
-  TRACE_EVENT0("cc", "CompositorImpl::ScheduleAnimation");
-  needs_composite_ = true;
-  PostComposite(COMPOSITE_EVENTUALLY);
-}
-
 void CompositorImpl::DidPostSwapBuffers() {
   TRACE_EVENT0("compositor", "CompositorImpl::DidPostSwapBuffers");
   did_post_swapbuffers_ = true;