Rename Animate as Begin(Main)Frame

ui/compositor/compositor.cc

 // Copyright (c) 2012 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 "ui/compositor/compositor.h"
 
 #include <algorithm>
 #include <deque>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/sys_info.h"
 #include "cc/base/latency_info_swap_promise.h"
 #include "cc/base/switches.h"
 #include "cc/input/input_handler.h"
 #include "cc/layers/layer.h"
+#include "cc/output/begin_frame_args.h"
 #include "cc/output/context_provider.h"
 #include "cc/trees/layer_tree_host.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/compositor/compositor_observer.h"
 #include "ui/compositor/compositor_switches.h"
 #include "ui/compositor/compositor_vsync_manager.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator_collection.h"
 #include "ui/gfx/frame_time.h"
@@ skipping 189 matching lines @@
 
   DCHECK_NE(swap_state_, SWAP_POSTED);
   swap_state_ = SWAP_NONE;
 
   waiting_on_compositing_end_ = true;
   last_started_frame_++;
   if (!IsLocked()) {
     // TODO(nduca): Temporary while compositor calls
     // compositeImmediately() directly.
     base::TimeTicks now = gfx::FrameTime::Now();
-    Animate(now);
+    cc::BeginFrameArgs args = cc::BeginFrameArgs::Create(
+        now, base::TimeTicks(), cc::BeginFrameArgs::DefaultInterval());
+    BeginMainFrame(args);
     Layout();
     host_->Composite(now);

[mithro-old, 2014/08/11 07:33:34]

Maybe
  cc::BeginFrameArgs args = cc::BeginFrameArgs::Create(
          gfx::FrameTime::Now(), base::TimeTicks(),
cc::BeginFrameArgs::DefaultInterval());
  BeginMainFrame(args);
  Layout();
  host_->Composite(args.frame_time);

I think that leaves open the question on why host_->Composite takes a frame_time
rather than a BeginFrameArgs.

[Sami, 2014/08/11 17:51:27]

Good idea, done.
One step at a time :)

   }
   if (swap_state_ == SWAP_NONE)
     NotifyEnd();
 }
 
 void Compositor::ScheduleFullRedraw() {
   host_->SetNeedsRedraw();
 }
 
 void Compositor::ScheduleRedrawRect(const gfx::Rect& damage_rect) {
@@ skipping 53 matching lines @@
 
 void Compositor::RemoveAnimationObserver(
     CompositorAnimationObserver* observer) {
   animation_observer_list_.RemoveObserver(observer);
 }
 
 bool Compositor::HasAnimationObserver(CompositorAnimationObserver* observer) {
   return animation_observer_list_.HasObserver(observer);
 }
 
-void Compositor::Animate(base::TimeTicks frame_begin_time) {
+void Compositor::BeginMainFrame(const cc::BeginFrameArgs& args) {
   FOR_EACH_OBSERVER(CompositorAnimationObserver,
                     animation_observer_list_,
-                    OnAnimationStep(frame_begin_time));
+                    OnAnimationStep(args.frame_time));
   if (animation_observer_list_.might_have_observers())
     host_->SetNeedsAnimate();
 }
 
 void Compositor::Layout() {
   // We're sending damage that will be addressed during this composite
   // cycle, so we don't need to schedule another composite to address it.
   disable_schedule_composite_ = true;
   if (root_layer_)
     root_layer_->SendDamagedRects();
@@ skipping 103 matching lines @@
     // CompositorObservers to be notified before starting another
     // draw cycle.
     ScheduleDraw();
   }
   FOR_EACH_OBSERVER(CompositorObserver,
                     observer_list_,
                     OnCompositingEnded(this));
 }
 
 }  // namespace ui