| Index: ui/compositor/compositor.cc
|
| diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
|
| index 6be853098a86117753738674d695a3893de05477..3026b6db2acff6aed955870aa51c332853f35ae7 100644
|
| --- a/ui/compositor/compositor.cc
|
| +++ b/ui/compositor/compositor.cc
|
| @@ -18,6 +18,7 @@
|
| #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"
|
| @@ -273,10 +274,10 @@ 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();
|
| }
|
|
|