| Index: cc/trees/layer_tree_host_unittest_animation.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc
|
| index 70e2a9ec6d876540fa8a28f74e50788f8d752a96..31f0ff41129246d7ac9d3f6040102baa24dd94bb 100644
|
| --- a/cc/trees/layer_tree_host_unittest_animation.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_animation.cc
|
| @@ -14,6 +14,7 @@
|
| #include "cc/test/fake_content_layer_client.h"
|
| #include "cc/test/layer_tree_test.h"
|
| #include "cc/trees/layer_tree_impl.h"
|
| +#include "ui/gfx/frame_time.h"
|
|
|
| namespace cc {
|
| namespace {
|
| @@ -38,7 +39,7 @@ class LayerTreeHostAnimationTestSetNeedsAnimateShouldNotSetCommitRequested
|
| PostSetNeedsCommitToMainThread();
|
| }
|
|
|
| - virtual void Animate(base::TimeTicks monotonic_time) OVERRIDE {
|
| + virtual void Animate(gfx::FrameTime monotonic_time) OVERRIDE {
|
| // We skip the first commit becasue its the commit that populates the
|
| // impl thread with a tree. After the second commit, the test is done.
|
| if (num_commits_ != 1)
|
| @@ -89,7 +90,7 @@ class LayerTreeHostAnimationTestSetNeedsAnimateInsideAnimationCallback
|
| PostSetNeedsCommitToMainThread();
|
| }
|
|
|
| - virtual void Animate(base::TimeTicks) OVERRIDE {
|
| + virtual void Animate(gfx::FrameTime) OVERRIDE {
|
| if (!num_animates_) {
|
| layer_tree_host()->SetNeedsAnimate();
|
| num_animates_++;
|
| @@ -189,7 +190,7 @@ class LayerTreeHostAnimationTestCheckerboardDoesNotStarveDraws
|
|
|
| virtual void AnimateLayers(
|
| LayerTreeHostImpl* host_impl,
|
| - base::TimeTicks monotonic_time) OVERRIDE {
|
| + gfx::FrameTime monotonic_time) OVERRIDE {
|
| started_animating_ = true;
|
| }
|
|
|
| @@ -227,7 +228,7 @@ class LayerTreeHostAnimationTestAnimationsGetDeleted
|
|
|
| virtual void AnimateLayers(
|
| LayerTreeHostImpl* host_impl,
|
| - base::TimeTicks monotonic_time) OVERRIDE {
|
| + gfx::FrameTime monotonic_time) OVERRIDE {
|
| bool have_animations = !host_impl->animation_registrar()->
|
| active_animation_controllers().empty();
|
| if (!started_animating_ && have_animations) {
|
| @@ -269,7 +270,7 @@ class LayerTreeHostAnimationTestTickAnimationWhileBackgrounded
|
| // mode.
|
| virtual void WillAnimateLayers(
|
| LayerTreeHostImpl* host_impl,
|
| - base::TimeTicks monotonic_time) OVERRIDE {
|
| + gfx::FrameTime monotonic_time) OVERRIDE {
|
| // Verify that the host can draw, it's just not visible.
|
| EXPECT_TRUE(host_impl->CanDraw());
|
| if (num_animates_ < 2) {
|
| @@ -401,7 +402,7 @@ class LayerTreeHostAnimationTestNoBackgroundTickingWithoutActiveTree
|
| }
|
|
|
| virtual void WillAnimateLayers(LayerTreeHostImpl* host_impl,
|
| - base::TimeTicks monotonic_time) OVERRIDE {
|
| + gfx::FrameTime monotonic_time) OVERRIDE {
|
| EXPECT_TRUE(host_impl->active_tree()->root_layer());
|
| active_tree_was_animated_ = true;
|
| }
|
| @@ -442,7 +443,7 @@ class LayerTreeHostAnimationTestAddAnimationWithTimingFunction
|
|
|
| virtual void AnimateLayers(
|
| LayerTreeHostImpl* host_impl,
|
| - base::TimeTicks monotonic_time) OVERRIDE {
|
| + gfx::FrameTime monotonic_time) OVERRIDE {
|
| LayerAnimationController* controller_impl =
|
| host_impl->active_tree()->root_layer()->children()[0]->
|
| layer_animation_controller();
|
| @@ -642,7 +643,7 @@ class LayerTreeHostAnimationTestLayerAddedWithAnimation
|
|
|
| virtual void AnimateLayers(
|
| LayerTreeHostImpl* impl_host,
|
| - base::TimeTicks monotonic_time) OVERRIDE {
|
| + gfx::FrameTime monotonic_time) OVERRIDE {
|
| EndTest();
|
| }
|
|
|
| @@ -659,7 +660,7 @@ class LayerTreeHostAnimationTestCompositeAndReadbackAnimateCount
|
| : animated_commit_(-1) {
|
| }
|
|
|
| - virtual void Animate(base::TimeTicks) OVERRIDE {
|
| + virtual void Animate(gfx::FrameTime) OVERRIDE {
|
| // We shouldn't animate on the CompositeAndReadback-forced commit, but we
|
| // should for the SetNeedsCommit-triggered commit.
|
| animated_commit_ = layer_tree_host()->source_frame_number();
|
| @@ -714,7 +715,7 @@ class LayerTreeHostAnimationTestContinuousAnimate
|
| PostSetNeedsCommitToMainThread();
|
| }
|
|
|
| - virtual void Animate(base::TimeTicks) OVERRIDE {
|
| + virtual void Animate(gfx::FrameTime) OVERRIDE {
|
| if (num_draw_layers_ == 2)
|
| return;
|
| layer_tree_host()->SetNeedsAnimate();
|
|
|