Rename Animate as Begin(Main)Frame

cc/trees/single_thread_proxy.cc

Index: cc/trees/single_thread_proxy.cc
diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc
index 7be4ca8c9e0b618c975d2d153bea730f08e4c38b..f25774aac4866eff925b77a203bea19f786f754c 100644
--- a/cc/trees/single_thread_proxy.cc
+++ b/cc/trees/single_thread_proxy.cc
@@ -159,12 +159,12 @@ void SingleThreadProxy::SetNeedsUpdateLayers() {
   SetNeedsCommit();
 }
 
-void SingleThreadProxy::DoCommit(base::TimeTicks frame_begin_time) {
+void SingleThreadProxy::DoCommit(const BeginFrameArgs& begin_frame_args) {
   TRACE_EVENT0("cc", "SingleThreadProxy::DoCommit");
   DCHECK(Proxy::IsMainThread());
   layer_tree_host_->WillBeginMainFrame();
-  layer_tree_host_->UpdateClientAnimations(frame_begin_time);
-  layer_tree_host_->AnimateLayers(frame_begin_time);
+  layer_tree_host_->BeginMainFrame(begin_frame_args);
+  layer_tree_host_->AnimateLayers(begin_frame_args.frame_time);
   layer_tree_host_->Layout();
   commit_requested_ = false;
 
@@ -436,7 +436,8 @@ void SingleThreadProxy::CompositeImmediately(base::TimeTicks frame_begin_time) {
   DCHECK(Proxy::IsMainThread());
   DCHECK(!layer_tree_host_->output_surface_lost());
 
-  DoCommit(frame_begin_time);
+  DoCommit(BeginFrameArgs::Create(
+      frame_begin_time, base::TimeTicks(), BeginFrameArgs::DefaultInterval()));
 
   LayerTreeHostImpl::FrameData frame;
   DoComposite(frame_begin_time, &frame);
@@ -500,7 +501,7 @@ DrawResult SingleThreadProxy::DoComposite(base::TimeTicks frame_begin_time,
     timing_history_.DidStartDrawing();
 
     layer_tree_host_impl_->Animate(
-        layer_tree_host_impl_->CurrentFrameTimeTicks());
+        layer_tree_host_impl_->CurrentBeginFrameArgs().frame_time);
     UpdateBackgroundAnimateTicking();
 
     if (!layer_tree_host_impl_->IsContextLost()) {
@@ -512,7 +513,7 @@ DrawResult SingleThreadProxy::DoComposite(base::TimeTicks frame_begin_time,
     bool start_ready_animations = true;
     layer_tree_host_impl_->UpdateAnimationState(start_ready_animations);
 
-    layer_tree_host_impl_->ResetCurrentFrameTimeForNextFrame();
+    layer_tree_host_impl_->ResetCurrentBeginFrameArgsForNextFrame();
 
     timing_history_.DidFinishDrawing();
   }
@@ -628,7 +629,8 @@ DrawResult SingleThreadProxy::ScheduledActionDrawAndSwapIfPossible() {
   }
 
   LayerTreeHostImpl::FrameData frame;
-  return DoComposite(layer_tree_host_impl_->CurrentFrameTimeTicks(), &frame);
+  return DoComposite(layer_tree_host_impl_->CurrentBeginFrameArgs().frame_time,
+                     &frame);
 }
 
 DrawResult SingleThreadProxy::ScheduledActionDrawAndSwapForced() {
@@ -638,13 +640,13 @@ DrawResult SingleThreadProxy::ScheduledActionDrawAndSwapForced() {
 
 void SingleThreadProxy::ScheduledActionCommit() {
   DebugScopedSetMainThread main(this);
-  DoCommit(layer_tree_host_impl_->CurrentFrameTimeTicks());
+  DoCommit(layer_tree_host_impl_->CurrentBeginFrameArgs());
 }
 
 void SingleThreadProxy::ScheduledActionAnimate() {
   TRACE_EVENT0("cc", "ScheduledActionAnimate");
   layer_tree_host_impl_->Animate(
-      layer_tree_host_impl_->CurrentFrameTimeTicks());
+      layer_tree_host_impl_->CurrentBeginFrameArgs().frame_time);
 }
 
 void SingleThreadProxy::ScheduledActionUpdateVisibleTiles() {
@@ -693,7 +695,7 @@ base::TimeDelta SingleThreadProxy::CommitToActivateDurationEstimate() {
 }
 
 void SingleThreadProxy::DidBeginImplFrameDeadline() {
-  layer_tree_host_impl_->ResetCurrentFrameTimeForNextFrame();
+  layer_tree_host_impl_->ResetCurrentBeginFrameArgsForNextFrame();
 }
 
 }  // namespace cc