Revert 245445 "Unifies LayerTreeHost::SetNeedsUpdateLayers and S..."

trunk/src/content/renderer/gpu/render_widget_compositor.cc

Index: trunk/src/content/renderer/gpu/render_widget_compositor.cc
===================================================================
--- trunk/src/content/renderer/gpu/render_widget_compositor.cc	(revision 245527)
+++ trunk/src/content/renderer/gpu/render_widget_compositor.cc	(working copy)
@@ -348,8 +348,8 @@
 }
 
 void RenderWidgetCompositor::SetNeedsForcedRedraw() {
-  layer_tree_host_->set_next_commit_forces_redraw();
-  setNeedsUpdateLayers();
+  layer_tree_host_->SetNextCommitForcesRedraw();
+  setNeedsAnimate();
 }
 
 scoped_ptr<cc::SwapPromiseMonitor>
@@ -468,19 +468,12 @@
       duration);
 }
 
-// Renamed. Staged for removal.
 void RenderWidgetCompositor::setNeedsAnimate() {
-  setNeedsUpdateLayers();
+  layer_tree_host_->SetNeedsAnimate();
 }
 
-void RenderWidgetCompositor::setNeedsUpdateLayers() {
-  layer_tree_host_->SetNeedsUpdateLayers();
-}
-
-// Unused. Staged for removal.
 bool RenderWidgetCompositor::commitRequested() const {
-  NOTREACHED();
-  return false;
+  return layer_tree_host_->CommitRequested();
 }
 
 void RenderWidgetCompositor::didStopFlinging() {
@@ -618,14 +611,11 @@
 
 void RenderWidgetCompositor::ScheduleComposite() {
   if (!suppress_schedule_composite_)
-    widget_->ScheduleComposite();
+    widget_->scheduleComposite();
 }
 
 void RenderWidgetCompositor::ScheduleAnimation() {
-  widget_->ScheduleAnimation();
-  // ScheduleAnimation alone doesn't trigger a redraw.
-  // ScheduleComposite here to send an artifical invalidation.
-  ScheduleComposite();
+  widget_->scheduleAnimation();
 }
 
 void RenderWidgetCompositor::DidPostSwapBuffers() {