Rename Animate as Begin(Main)Frame

cc/trees/single_thread_proxy.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/single_thread_proxy.h"
 
 #include "base/auto_reset.h"
 #include "base/debug/trace_event.h"
 #include "cc/debug/benchmark_instrumentation.h"
 #include "cc/output/context_provider.h"
@@ skipping 141 matching lines @@
   client_->ScheduleAnimation();
   SetNeedsCommit();
 }
 
 void SingleThreadProxy::SetNeedsUpdateLayers() {
   TRACE_EVENT0("cc", "SingleThreadProxy::SetNeedsUpdateLayers");
   DCHECK(Proxy::IsMainThread());
   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;
 
   if (PrioritizedResourceManager* contents_texture_manager =
           layer_tree_host_->contents_texture_manager()) {
     contents_texture_manager->UnlinkAndClearEvictedBackings();
     contents_texture_manager->SetMaxMemoryLimitBytes(
         layer_tree_host_impl_->memory_allocation_limit_bytes());
     contents_texture_manager->SetExternalPriorityCutoff(
         layer_tree_host_impl_->memory_allocation_priority_cutoff());
@@ skipping 251 matching lines @@
   TRACE_EVENT0("cc", "SingleThreadProxy::BeginFrame");
   if (scheduler_on_impl_thread_)
     scheduler_on_impl_thread_->BeginImplFrame(args);
 }
 
 void SingleThreadProxy::CompositeImmediately(base::TimeTicks frame_begin_time) {
   TRACE_EVENT0("cc", "SingleThreadProxy::CompositeImmediately");
   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);
 }
 
 void SingleThreadProxy::AsValueInto(base::debug::TracedValue* state) const {
   // The following line casts away const modifiers because it is just
   // setting debug state. We still want the AsValue() function and its
   // call chain to be const throughout.
   DebugScopedSetImplThread impl(const_cast<SingleThreadProxy*>(this));
@@ skipping 43 matching lines @@
     // DrawLayers() depends on the result of PrepareToDraw(), it is guarded on
     // CanDraw() as well.
     if (!ShouldComposite()) {
       UpdateBackgroundAnimateTicking();
       return DRAW_ABORTED_CANT_DRAW;
     }
 
     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()) {
       layer_tree_host_impl_->PrepareToDraw(frame);
       layer_tree_host_impl_->DrawLayers(frame, frame_begin_time);
       layer_tree_host_impl_->DidDrawAllLayers(*frame);
     }
 
     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();
   }
 
   {
     DebugScopedSetImplThread impl(this);
 
     if (layer_tree_host_impl_->IsContextLost()) {
       DidLoseOutputSurfaceOnImplThread();
     } else {
@@ skipping 95 matching lines @@
 }
 
 DrawResult SingleThreadProxy::ScheduledActionDrawAndSwapIfPossible() {
   DebugScopedSetImplThread impl(this);
   if (layer_tree_host_impl_->IsContextLost()) {
     DidCommitAndDrawFrame();
     return DRAW_SUCCESS;
   }
 
   LayerTreeHostImpl::FrameData frame;
-  return DoComposite(layer_tree_host_impl_->CurrentFrameTimeTicks(), &frame);
+  return DoComposite(layer_tree_host_impl_->CurrentBeginFrameArgs().frame_time,
+                     &frame);
 }
 
 DrawResult SingleThreadProxy::ScheduledActionDrawAndSwapForced() {
   NOTREACHED();
   return INVALID_RESULT;
 }
 
 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() {
   // Impl-side painting only.
   NOTREACHED();
 }
 
 void SingleThreadProxy::ScheduledActionActivateSyncTree() {
 }
 
@@ skipping 28 matching lines @@
 
 base::TimeDelta SingleThreadProxy::BeginMainFrameToCommitDurationEstimate() {
   return timing_history_.BeginMainFrameToCommitDurationEstimate();
 }
 
 base::TimeDelta SingleThreadProxy::CommitToActivateDurationEstimate() {
   return timing_history_.CommitToActivateDurationEstimate();
 }
 
 void SingleThreadProxy::DidBeginImplFrameDeadline() {
-  layer_tree_host_impl_->ResetCurrentFrameTimeForNextFrame();
+  layer_tree_host_impl_->ResetCurrentBeginFrameArgsForNextFrame();
 }
 
 }  // namespace cc