cc/animation/layer_animation_controller_unittest.cc - Issue 226543005: CC should use TimeTicks and TimeDelta to represent time

Unified Diff: cc/animation/layer_animation_controller_unittest.cc

Issue 226543005: CC should use TimeTicks and TimeDelta to represent time (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Tests related changes Created 6 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: cc/animation/layer_animation_controller_unittest.cc

diff --git a/cc/animation/layer_animation_controller_unittest.cc b/cc/animation/layer_animation_controller_unittest.cc

index 4dca3f625689d6d0d45257cc4537b710237264c9..f3a4c5dc862e89485e6e338861a9a5030fda4106 100644

--- a/cc/animation/layer_animation_controller_unittest.cc

+++ b/cc/animation/layer_animation_controller_unittest.cc

@@ -24,6 +24,10 @@ namespace {

// with start time 0.0 is treated as an animation whose start time has

// not yet been set.

const double kInitialTickTime = 1.0;

+base::TimeTicks GetTimeTicks(double time) {

+ return base::TimeTicks::FromInternalValue(time *

+ base::Time::kMicrosecondsPerSecond);

scoped_ptr<Animation> CreateAnimation(scoped_ptr<AnimationCurve> curve,

int id,

@@ -79,7 +83,7 @@ TEST(LayerAnimationControllerTest, DoNotClobberStartTimes) {

Animation::Opacity)->run_state());

AnimationEventsVector events;

- controller_impl->Animate(kInitialTickTime);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime));

controller_impl->UpdateState(true, &events);

// Synchronize the start times.

@@ -91,7 +95,7 @@ TEST(LayerAnimationControllerTest, DoNotClobberStartTimes) {

Animation::Opacity)->start_time());

// Start the animation on the main thread. Should not affect the start time.

- controller->Animate(kInitialTickTime + 0.5);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 0.5));

controller->UpdateState(true, NULL);

EXPECT_EQ(controller->GetAnimation(group_id,

Animation::Opacity)->start_time(),

@@ -113,7 +117,8 @@ TEST(LayerAnimationControllerTest, UseSpecifiedStartTimes) {

int group_id = controller->GetAnimation(Animation::Opacity)->group();

const double start_time = 123;

- controller->GetAnimation(Animation::Opacity)->set_start_time(start_time);

+ controller->GetAnimation(Animation::Opacity)

+ ->set_start_time(GetTimeTicks(start_time));

controller->PushAnimationUpdatesTo(controller_impl.get());

@@ -123,7 +128,7 @@ TEST(LayerAnimationControllerTest, UseSpecifiedStartTimes) {

Animation::Opacity)->run_state());

AnimationEventsVector events;

- controller_impl->Animate(kInitialTickTime);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime));

controller_impl->UpdateState(true, &events);

// Synchronize the start times.

@@ -139,7 +144,7 @@ TEST(LayerAnimationControllerTest, UseSpecifiedStartTimes) {

Animation::Opacity)->start_time());

// Start the animation on the main thread. Should not affect the start time.

- controller->Animate(kInitialTickTime + 0.5);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 0.5));

controller->UpdateState(true, NULL);

EXPECT_EQ(start_time,

controller->GetAnimation(group_id,

@@ -184,7 +189,7 @@ TEST(LayerAnimationControllerTest, Activation) {

EXPECT_EQ(1u, registrar->active_animation_controllers().size());

EXPECT_EQ(1u, registrar_impl->active_animation_controllers().size());

- controller_impl->Animate(kInitialTickTime);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime));

controller_impl->UpdateState(true, events.get());

EXPECT_EQ(1u, events->size());

controller->NotifyAnimationStarted((*events)[0]);

@@ -192,18 +197,18 @@ TEST(LayerAnimationControllerTest, Activation) {

EXPECT_EQ(1u, registrar->active_animation_controllers().size());

EXPECT_EQ(1u, registrar_impl->active_animation_controllers().size());

- controller->Animate(kInitialTickTime + 0.5);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 0.5));

controller->UpdateState(true, NULL);

EXPECT_EQ(1u, registrar->active_animation_controllers().size());

- controller->Animate(kInitialTickTime + 1.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 1.0));

controller->UpdateState(true, NULL);

EXPECT_EQ(Animation::Finished,

controller->GetAnimation(Animation::Opacity)->run_state());

EXPECT_EQ(1u, registrar->active_animation_controllers().size());

events.reset(new AnimationEventsVector);

- controller_impl->Animate(kInitialTickTime + 1.5);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime + 1.5));

controller_impl->UpdateState(true, events.get());

EXPECT_EQ(Animation::WaitingForDeletion,

@@ -213,7 +218,7 @@ TEST(LayerAnimationControllerTest, Activation) {

EXPECT_EQ(1u, events->size());

controller->NotifyAnimationFinished((*events)[0]);

- controller->Animate(kInitialTickTime + 1.5);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 1.5));

controller->UpdateState(true, NULL);

EXPECT_EQ(Animation::WaitingForDeletion,

@@ -256,9 +261,9 @@ TEST(LayerAnimationControllerTest, SyncPause) {

// Start the animations on each controller.

AnimationEventsVector events;

- controller_impl->Animate(kInitialTickTime);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime));

controller_impl->UpdateState(true, &events);

- controller->Animate(kInitialTickTime);

+ controller->Animate(GetTimeTicks(kInitialTickTime));

controller->UpdateState(true, NULL);

EXPECT_EQ(Animation::Running,

controller_impl->GetAnimation(group_id,

@@ -268,7 +273,8 @@ TEST(LayerAnimationControllerTest, SyncPause) {

Animation::Opacity)->run_state());

// Pause the main-thread animation.

- controller->PauseAnimation(animation_id, kInitialTickTime + 1.0);

+ controller->PauseAnimation(animation_id,

+ GetTimeTicks(kInitialTickTime + 1.0));

EXPECT_EQ(Animation::Paused,

controller->GetAnimation(group_id,

Animation::Opacity)->run_state());

@@ -308,7 +314,7 @@ TEST(LayerAnimationControllerTest, DoNotSyncFinishedAnimation) {

group_id,

Animation::Opacity,

- kInitialTickTime);

+ GetTimeTicks(kInitialTickTime));

controller->NotifyAnimationStarted(animation_started_event);

// Force animation to complete on impl thread.

@@ -338,11 +344,11 @@ TEST(LayerAnimationControllerTest, AnimationsAreDeleted) {

controller_impl->AddValueObserver(&dummy_impl);

AddOpacityTransitionToController(controller.get(), 1.0, 0.0f, 1.0f, false);

- controller->Animate(kInitialTickTime);

+ controller->Animate(GetTimeTicks(kInitialTickTime));

controller->UpdateState(true, NULL);

controller->PushAnimationUpdatesTo(controller_impl.get());

- controller_impl->Animate(kInitialTickTime + 0.5);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime + 0.5));

controller_impl->UpdateState(true, events.get());

// There should be a Started event for the animation.

@@ -350,14 +356,14 @@ TEST(LayerAnimationControllerTest, AnimationsAreDeleted) {

EXPECT_EQ(AnimationEvent::Started, (*events)[0].type);

controller->NotifyAnimationStarted((*events)[0]);

- controller->Animate(kInitialTickTime + 1.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 1.0));

controller->UpdateState(true, NULL);

EXPECT_FALSE(dummy.animation_waiting_for_deletion());

EXPECT_FALSE(dummy_impl.animation_waiting_for_deletion());

events.reset(new AnimationEventsVector);

- controller_impl->Animate(kInitialTickTime + 2.0);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime + 2.0));

controller_impl->UpdateState(true, events.get());

EXPECT_TRUE(dummy_impl.animation_waiting_for_deletion());

@@ -372,7 +378,7 @@ TEST(LayerAnimationControllerTest, AnimationsAreDeleted) {

controller->NotifyAnimationFinished((*events)[0]);

- controller->Animate(kInitialTickTime + 3.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 3.0));

controller->UpdateState(true, NULL);

EXPECT_TRUE(dummy.animation_waiting_for_deletion());

@@ -409,14 +415,14 @@ TEST(LayerAnimationControllerTest, TrivialTransition) {

Animation::Opacity));

controller->AddAnimation(to_add.Pass());

- controller->Animate(kInitialTickTime);

+ controller->Animate(GetTimeTicks(kInitialTickTime));

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.f, dummy.opacity());

// A non-impl-only animation should not generate property updates.

const AnimationEvent* event = GetMostRecentPropertyUpdateEvent(events.get());

EXPECT_FALSE(event);

- controller->Animate(kInitialTickTime + 1.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 1.0));

controller->UpdateState(true, events.get());

EXPECT_EQ(1.f, dummy.opacity());

EXPECT_FALSE(controller->HasActiveAnimation());

@@ -439,7 +445,7 @@ TEST(LayerAnimationControllerTest, TrivialTransitionOnImpl) {

to_add->set_is_impl_only(true);

controller_impl->AddAnimation(to_add.Pass());

- controller_impl->Animate(kInitialTickTime);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime));

controller_impl->UpdateState(true, events.get());

EXPECT_TRUE(controller_impl->HasActiveAnimation());

EXPECT_EQ(0.f, dummy_impl.opacity());

@@ -448,7 +454,7 @@ TEST(LayerAnimationControllerTest, TrivialTransitionOnImpl) {

GetMostRecentPropertyUpdateEvent(events.get());

EXPECT_EQ(0.f, start_opacity_event->opacity);

- controller_impl->Animate(kInitialTickTime + 1.0);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime + 1.0));

controller_impl->UpdateState(true, events.get());

EXPECT_EQ(1.f, dummy_impl.opacity());

EXPECT_FALSE(controller_impl->HasActiveAnimation());

@@ -488,7 +494,7 @@ TEST(LayerAnimationControllerTest, TrivialTransformOnImpl) {

controller_impl->AddAnimation(animation.Pass());

// Run animation.

- controller_impl->Animate(kInitialTickTime);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime));

controller_impl->UpdateState(true, events.get());

EXPECT_TRUE(controller_impl->HasActiveAnimation());

EXPECT_EQ(gfx::Transform(), dummy_impl.transform());

@@ -502,7 +508,7 @@ TEST(LayerAnimationControllerTest, TrivialTransformOnImpl) {

gfx::Transform expected_transform;

expected_transform.Translate(delta_x, delta_y);

- controller_impl->Animate(kInitialTickTime + 1.0);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime + 1.0));

controller_impl->UpdateState(true, events.get());

EXPECT_EQ(expected_transform, dummy_impl.transform());

EXPECT_FALSE(controller_impl->HasActiveAnimation());

@@ -537,7 +543,7 @@ TEST(LayerAnimationControllerTest, FilterTransition) {

curve.PassAs<AnimationCurve>(), 1, 0, Animation::Filter));

controller->AddAnimation(animation.Pass());

- controller->Animate(kInitialTickTime);

+ controller->Animate(GetTimeTicks(kInitialTickTime));

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(start_filters, dummy.filters());

@@ -545,7 +551,7 @@ TEST(LayerAnimationControllerTest, FilterTransition) {

const AnimationEvent* event = GetMostRecentPropertyUpdateEvent(events.get());

EXPECT_FALSE(event);

- controller->Animate(kInitialTickTime + 0.5);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 0.5));

controller->UpdateState(true, events.get());

EXPECT_EQ(1u, dummy.filters().size());

EXPECT_EQ(FilterOperation::CreateBrightnessFilter(1.5f),

@@ -553,7 +559,7 @@ TEST(LayerAnimationControllerTest, FilterTransition) {

event = GetMostRecentPropertyUpdateEvent(events.get());

EXPECT_FALSE(event);

- controller->Animate(kInitialTickTime + 1.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 1.0));

controller->UpdateState(true, events.get());

EXPECT_EQ(end_filters, dummy.filters());

EXPECT_FALSE(controller->HasActiveAnimation());

@@ -588,7 +594,7 @@ TEST(LayerAnimationControllerTest, FilterTransitionOnImplOnly) {

controller_impl->AddAnimation(animation.Pass());

// Run animation.

- controller_impl->Animate(kInitialTickTime);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime));

controller_impl->UpdateState(true, events.get());

EXPECT_TRUE(controller_impl->HasActiveAnimation());

EXPECT_EQ(start_filters, dummy_impl.filters());

@@ -599,7 +605,7 @@ TEST(LayerAnimationControllerTest, FilterTransitionOnImplOnly) {

EXPECT_EQ(start_filters, start_filter_event->filters);

EXPECT_TRUE(start_filter_event->is_impl_only);

- controller_impl->Animate(kInitialTickTime + 1.0);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime + 1.0));

controller_impl->UpdateState(true, events.get());

EXPECT_EQ(end_filters, dummy_impl.filters());

EXPECT_FALSE(controller_impl->HasActiveAnimation());

@@ -649,12 +655,12 @@ TEST(LayerAnimationControllerTest, ScrollOffsetTransition) {

duration,

controller->GetAnimation(Animation::ScrollOffset)->curve()->Duration());

- controller->Animate(kInitialTickTime);

+ controller->Animate(GetTimeTicks(kInitialTickTime));

controller->UpdateState(true, NULL);

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(initial_value, dummy.scroll_offset());

- controller_impl->Animate(kInitialTickTime);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime));

controller_impl->UpdateState(true, events.get());

EXPECT_TRUE(controller_impl->HasActiveAnimation());

EXPECT_EQ(initial_value, dummy_impl.scroll_offset());

@@ -663,26 +669,26 @@ TEST(LayerAnimationControllerTest, ScrollOffsetTransition) {

EXPECT_FALSE(event);

controller->NotifyAnimationStarted((*events)[0]);

- controller->Animate(kInitialTickTime + duration/2.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + dur) ation / 2.0);

controller->UpdateState(true, NULL);

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(200.f, 250.f), dummy.scroll_offset());

- controller_impl->Animate(kInitialTickTime + duration/2.0);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime + dur) ation / 2.0);

controller_impl->UpdateState(true, events.get());

EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(200.f, 250.f),

dummy_impl.scroll_offset());

event = GetMostRecentPropertyUpdateEvent(events.get());

EXPECT_FALSE(event);

- controller_impl->Animate(kInitialTickTime + duration);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime + dur) ation);

controller_impl->UpdateState(true, events.get());

EXPECT_VECTOR2DF_EQ(target_value, dummy_impl.scroll_offset());

EXPECT_FALSE(controller_impl->HasActiveAnimation());

event = GetMostRecentPropertyUpdateEvent(events.get());

EXPECT_FALSE(event);

- controller->Animate(kInitialTickTime + duration);

+ controller->Animate(GetTimeTicks(kInitialTickTime + dur) ation);

controller->UpdateState(true, NULL);

EXPECT_VECTOR2DF_EQ(target_value, dummy.scroll_offset());

EXPECT_FALSE(controller->HasActiveAnimation());

@@ -727,12 +733,12 @@ TEST(LayerAnimationControllerTest, ScrollOffsetTransitionNoImplProvider) {

duration,

controller->GetAnimation(Animation::ScrollOffset)->curve()->Duration());

- controller->Animate(kInitialTickTime);

+ controller->Animate(GetTimeTicks(kInitialTickTime));

controller->UpdateState(true, NULL);

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(initial_value, dummy.scroll_offset());

- controller_impl->Animate(kInitialTickTime);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime));

controller_impl->UpdateState(true, events.get());

EXPECT_TRUE(controller_impl->HasActiveAnimation());

EXPECT_EQ(initial_value, dummy_impl.scroll_offset());

@@ -741,26 +747,26 @@ TEST(LayerAnimationControllerTest, ScrollOffsetTransitionNoImplProvider) {

EXPECT_FALSE(event);

controller->NotifyAnimationStarted((*events)[0]);

- controller->Animate(kInitialTickTime + duration/2.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + dur) ation / 2.0);

controller->UpdateState(true, NULL);

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(400.f, 150.f), dummy.scroll_offset());

- controller_impl->Animate(kInitialTickTime + duration/2.0);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime + dur) ation / 2.0);

controller_impl->UpdateState(true, events.get());

EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(400.f, 150.f),

dummy_impl.scroll_offset());

event = GetMostRecentPropertyUpdateEvent(events.get());

EXPECT_FALSE(event);

- controller_impl->Animate(kInitialTickTime + duration);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime + dur) ation);

controller_impl->UpdateState(true, events.get());

EXPECT_VECTOR2DF_EQ(target_value, dummy_impl.scroll_offset());

EXPECT_FALSE(controller_impl->HasActiveAnimation());

event = GetMostRecentPropertyUpdateEvent(events.get());

EXPECT_FALSE(event);

- controller->Animate(kInitialTickTime + duration);

+ controller->Animate(GetTimeTicks(kInitialTickTime + dur) ation);

controller->UpdateState(true, NULL);

EXPECT_VECTOR2DF_EQ(target_value, dummy.scroll_offset());

EXPECT_FALSE(controller->HasActiveAnimation());

@@ -788,7 +794,7 @@ TEST(LayerAnimationControllerTest, ScrollOffsetTransitionOnImplOnly) {

animation->set_is_impl_only(true);

controller_impl->AddAnimation(animation.Pass());

- controller_impl->Animate(kInitialTickTime);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime));

controller_impl->UpdateState(true, events.get());

EXPECT_TRUE(controller_impl->HasActiveAnimation());

EXPECT_EQ(initial_value, dummy_impl.scroll_offset());

@@ -796,14 +802,14 @@ TEST(LayerAnimationControllerTest, ScrollOffsetTransitionOnImplOnly) {

const AnimationEvent* event = GetMostRecentPropertyUpdateEvent(events.get());

EXPECT_FALSE(event);

- controller_impl->Animate(kInitialTickTime + duration/2.0);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime + dur) ation / 2.0);

controller_impl->UpdateState(true, events.get());

EXPECT_VECTOR2DF_EQ(gfx::Vector2dF(200.f, 250.f),

dummy_impl.scroll_offset());

event = GetMostRecentPropertyUpdateEvent(events.get());

EXPECT_FALSE(event);

- controller_impl->Animate(kInitialTickTime + duration);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime + dur) ation);

controller_impl->UpdateState(true, events.get());

EXPECT_VECTOR2DF_EQ(target_value, dummy_impl.scroll_offset());

EXPECT_FALSE(controller_impl->HasActiveAnimation());

@@ -862,7 +868,7 @@ TEST(LayerAnimationControllerTest,

to_add->set_is_impl_only(true);

controller_impl->AddAnimation(to_add.Pass());

- controller_impl->Animate(kInitialTickTime);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime));

controller_impl->UpdateState(true, events.get());

// We should receive 2 events (a started notification and a property update).

@@ -879,7 +885,7 @@ TEST(LayerAnimationControllerTest,

EXPECT_TRUE(delegate.started());

events.reset(new AnimationEventsVector);

- controller_impl->Animate(kInitialTickTime + 1.0);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime + 1.0));

controller_impl->UpdateState(true, events.get());

// We should receive 2 events (a finished notification and a property update).

@@ -916,23 +922,27 @@ TEST(LayerAnimationControllerTest,

// We should pause at the first keyframe indefinitely waiting for that

// animation to start.

controller->AddAnimation(to_add.Pass());

- controller->Animate(kInitialTickTime);

+ controller->Animate(GetTimeTicks(kInitialTickTime));

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.f, dummy.opacity());

- controller->Animate(kInitialTickTime + 1.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 1.0));

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.f, dummy.opacity());

- controller->Animate(kInitialTickTime + 2.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 2.0));

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.f, dummy.opacity());

// Send the synchronized start time.

- controller->NotifyAnimationStarted(AnimationEvent(

- AnimationEvent::Started, 0, 1, Animation::Opacity, kInitialTickTime + 2));

- controller->Animate(kInitialTickTime + 5.0);

+ controller->NotifyAnimationStarted(

+ AnimationEvent(AnimationEvent::Started,

+ 0,

+ 1,

+ Animation::Opacity,

+ GetTimeTicks(kInitialTickTime + 2)));

+ controller->Animate(GetTimeTicks(kInitialTickTime + 5.0));

controller->UpdateState(true, events.get());

EXPECT_EQ(1.f, dummy.opacity());

EXPECT_FALSE(controller->HasActiveAnimation());

@@ -957,15 +967,15 @@ TEST(LayerAnimationControllerTest, TrivialQueuing) {

Animation::Opacity));

- controller->Animate(kInitialTickTime);

+ controller->Animate(GetTimeTicks(kInitialTickTime));

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.f, dummy.opacity());

- controller->Animate(kInitialTickTime + 1.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 1.0));

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(1.f, dummy.opacity());

- controller->Animate(kInitialTickTime + 2.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 2.0));

controller->UpdateState(true, events.get());

EXPECT_EQ(0.5f, dummy.opacity());

EXPECT_FALSE(controller->HasActiveAnimation());

@@ -983,7 +993,7 @@ TEST(LayerAnimationControllerTest, Interrupt) {

scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)).Pass(),

Animation::Opacity));

- controller->Animate(kInitialTickTime);

+ controller->Animate(GetTimeTicks(kInitialTickTime));

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.f, dummy.opacity());

@@ -998,11 +1008,11 @@ TEST(LayerAnimationControllerTest, Interrupt) {

// Since the previous animation was aborted, the new animation should start

// right in this call to animate.

- controller->Animate(kInitialTickTime + 0.5);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 0.5));

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(1.f, dummy.opacity());

- controller->Animate(kInitialTickTime + 1.5);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 1.5));

controller->UpdateState(true, events.get());

EXPECT_EQ(0.5f, dummy.opacity());

EXPECT_FALSE(controller->HasActiveAnimation());

@@ -1031,17 +1041,17 @@ TEST(LayerAnimationControllerTest, ScheduleTogetherWhenAPropertyIsBlocked) {

Animation::Opacity));

- controller->Animate(kInitialTickTime);

+ controller->Animate(GetTimeTicks(kInitialTickTime));

controller->UpdateState(true, events.get());

EXPECT_EQ(0.f, dummy.opacity());

EXPECT_TRUE(controller->HasActiveAnimation());

- controller->Animate(kInitialTickTime + 1.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 1.0));

controller->UpdateState(true, events.get());

// Should not have started the float transition yet.

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.f, dummy.opacity());

// The float animation should have started at time 1 and should be done.

- controller->Animate(kInitialTickTime + 2.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 2.0));

controller->UpdateState(true, events.get());

EXPECT_EQ(1.f, dummy.opacity());

EXPECT_FALSE(controller->HasActiveAnimation());

@@ -1073,14 +1083,14 @@ TEST(LayerAnimationControllerTest, ScheduleTogetherWithAnAnimWaiting) {

Animation::Opacity));

// Animations with id 1 should both start now.

- controller->Animate(kInitialTickTime);

+ controller->Animate(GetTimeTicks(kInitialTickTime));

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.f, dummy.opacity());

// The opacity animation should have finished at time 1, but the group

// of animations with id 1 don't finish until time 2 because of the length

// of the transform animation.

- controller->Animate(kInitialTickTime + 2.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 2.0));

controller->UpdateState(true, events.get());

// Should not have started the float transition yet.

EXPECT_TRUE(controller->HasActiveAnimation());

@@ -1088,7 +1098,7 @@ TEST(LayerAnimationControllerTest, ScheduleTogetherWithAnAnimWaiting) {

// The second opacity animation should start at time 2 and should be done by

// time 3.

- controller->Animate(kInitialTickTime + 3.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 3.0));

controller->UpdateState(true, events.get());

EXPECT_EQ(0.5f, dummy.opacity());

EXPECT_FALSE(controller->HasActiveAnimation());

@@ -1110,33 +1120,33 @@ TEST(LayerAnimationControllerTest, TrivialLooping) {

to_add->set_iterations(3);

controller->AddAnimation(to_add.Pass());

- controller->Animate(kInitialTickTime);

+ controller->Animate(GetTimeTicks(kInitialTickTime));

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.f, dummy.opacity());

- controller->Animate(kInitialTickTime + 1.25);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 1.2)5);

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.25f, dummy.opacity());

- controller->Animate(kInitialTickTime + 1.75);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 1.7)5);

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.75f, dummy.opacity());

- controller->Animate(kInitialTickTime + 2.25);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 2.2)5);

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.25f, dummy.opacity());

- controller->Animate(kInitialTickTime + 2.75);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 2.7)5);

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.75f, dummy.opacity());

- controller->Animate(kInitialTickTime + 3.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 3.0));

controller->UpdateState(true, events.get());

EXPECT_FALSE(controller->HasActiveAnimation());

EXPECT_EQ(1.f, dummy.opacity());

// Just be extra sure.

- controller->Animate(kInitialTickTime + 4.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 4.0));

controller->UpdateState(true, events.get());

EXPECT_EQ(1.f, dummy.opacity());

}

@@ -1158,31 +1168,31 @@ TEST(LayerAnimationControllerTest, InfiniteLooping) {

to_add->set_iterations(-1);

controller->AddAnimation(to_add.Pass());

- controller->Animate(kInitialTickTime);

+ controller->Animate(GetTimeTicks(kInitialTickTime));

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.f, dummy.opacity());

- controller->Animate(kInitialTickTime + 1.25);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 1.2)5);

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.25f, dummy.opacity());

- controller->Animate(kInitialTickTime + 1.75);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 1.7)5);

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.75f, dummy.opacity());

- controller->Animate(kInitialTickTime + 1073741824.25);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 107)3741824.25);

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.25f, dummy.opacity());

- controller->Animate(kInitialTickTime + 1073741824.75);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 107)3741824.75);

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.75f, dummy.opacity());

EXPECT_TRUE(controller->GetAnimation(id, Animation::Opacity));

- controller->GetAnimation(id, Animation::Opacity)->SetRunState(

- Animation::Aborted, kInitialTickTime + 0.75);

+ controller->GetAnimation(id, Animation::Opacity)

+ ->SetRunState(Animation::Aborted, GetTimeTicks(kInitialTickTime + 0.7)5);

EXPECT_FALSE(controller->HasActiveAnimation());

EXPECT_EQ(0.75f, dummy.opacity());

}

@@ -1202,33 +1212,33 @@ TEST(LayerAnimationControllerTest, PauseResume) {

id,

Animation::Opacity));

- controller->Animate(kInitialTickTime);

+ controller->Animate(GetTimeTicks(kInitialTickTime));

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.f, dummy.opacity());

- controller->Animate(kInitialTickTime + 0.5);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 0.5));

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.5f, dummy.opacity());

EXPECT_TRUE(controller->GetAnimation(id, Animation::Opacity));

- controller->GetAnimation(id, Animation::Opacity)->SetRunState(

- Animation::Paused, kInitialTickTime + 0.5);

+ controller->GetAnimation(id, Animation::Opacity)

+ ->SetRunState(Animation::Paused, GetTimeTicks(kInitialTickTime + 0.5));

- controller->Animate(kInitialTickTime + 1024.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 102)4.0);

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.5f, dummy.opacity());

EXPECT_TRUE(controller->GetAnimation(id, Animation::Opacity));

- controller->GetAnimation(id, Animation::Opacity)->SetRunState(

- Animation::Running, kInitialTickTime + 1024);

+ controller->GetAnimation(id, Animation::Opacity)

+ ->SetRunState(Animation::Running, GetTimeTicks(kInitialTickTime + 102)4);

- controller->Animate(kInitialTickTime + 1024.25);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 102)4.25);

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.75f, dummy.opacity());

- controller->Animate(kInitialTickTime + 1024.5);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 102)4.5);

controller->UpdateState(true, events.get());

EXPECT_FALSE(controller->HasActiveAnimation());

EXPECT_EQ(1.f, dummy.opacity());

@@ -1257,23 +1267,23 @@ TEST(LayerAnimationControllerTest, AbortAGroupedAnimation) {

Animation::Opacity));

- controller->Animate(kInitialTickTime);

+ controller->Animate(GetTimeTicks(kInitialTickTime));

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.f, dummy.opacity());

- controller->Animate(kInitialTickTime + 1.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 1.0));

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.5f, dummy.opacity());

EXPECT_TRUE(controller->GetAnimation(id, Animation::Opacity));

- controller->GetAnimation(id, Animation::Opacity)->SetRunState(

- Animation::Aborted, kInitialTickTime + 1.0);

- controller->Animate(kInitialTickTime + 1.0);

+ controller->GetAnimation(id, Animation::Opacity)

+ ->SetRunState(Animation::Aborted, GetTimeTicks(kInitialTickTime + 1.0));

+ controller->Animate(GetTimeTicks(kInitialTickTime + 1.0));

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(1.f, dummy.opacity());

- controller->Animate(kInitialTickTime + 2.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 2.0));

controller->UpdateState(true, events.get());

EXPECT_TRUE(!controller->HasActiveAnimation());

EXPECT_EQ(0.75f, dummy.opacity());

@@ -1298,7 +1308,7 @@ TEST(LayerAnimationControllerTest, PushUpdatesWhenSynchronizedStartTimeNeeded) {

to_add->set_needs_synchronized_start_time(true);

controller->AddAnimation(to_add.Pass());

- controller->Animate(kInitialTickTime);

+ controller->Animate(GetTimeTicks(kInitialTickTime));

controller->UpdateState(true, events.get());

EXPECT_TRUE(controller->HasActiveAnimation());

Animation* active_animation = controller->GetAnimation(0, Animation::Opacity);

@@ -1327,7 +1337,7 @@ TEST(LayerAnimationControllerTest, SkipUpdateState) {

Animation::Transform));

- controller->Animate(kInitialTickTime);

+ controller->Animate(GetTimeTicks(kInitialTickTime));

controller->UpdateState(true, events.get());

controller->AddAnimation(CreateAnimation(

@@ -1336,9 +1346,9 @@ TEST(LayerAnimationControllerTest, SkipUpdateState) {

Animation::Opacity));

// Animate but don't UpdateState.

- controller->Animate(kInitialTickTime + 1.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 1.0));

- controller->Animate(kInitialTickTime + 2.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 2.0));

events.reset(new AnimationEventsVector);

controller->UpdateState(true, events.get());

@@ -1350,7 +1360,7 @@ TEST(LayerAnimationControllerTest, SkipUpdateState) {

EXPECT_TRUE(controller->HasActiveAnimation());

EXPECT_EQ(0.f, dummy.opacity());

- controller->Animate(kInitialTickTime + 3.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 3.0));

controller->UpdateState(true, events.get());

// The float tranisition should now be done.

@@ -1376,7 +1386,7 @@ TEST(LayerAnimationControllerTest, InactiveObserverGetsTicked) {

// Without an observer, the animation shouldn't progress to the Starting

// state.

- controller->Animate(kInitialTickTime);

+ controller->Animate(GetTimeTicks(kInitialTickTime));

controller->UpdateState(true, events.get());

EXPECT_EQ(0u, events->size());

EXPECT_EQ(Animation::WaitingForTargetAvailability,

@@ -1387,7 +1397,7 @@ TEST(LayerAnimationControllerTest, InactiveObserverGetsTicked) {

// With only an inactive observer, the animation should progress to the

// Starting state and get ticked at its starting point, but should not

// progress to Running.

- controller->Animate(kInitialTickTime + 1.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 1.0));

controller->UpdateState(true, events.get());

EXPECT_EQ(0u, events->size());

EXPECT_EQ(Animation::Starting,

@@ -1396,7 +1406,7 @@ TEST(LayerAnimationControllerTest, InactiveObserverGetsTicked) {

// Even when already in the Starting state, the animation should stay

// there, and shouldn't be ticked past its starting point.

- controller->Animate(kInitialTickTime + 2.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 2.0));

controller->UpdateState(true, events.get());

EXPECT_EQ(0u, events->size());

EXPECT_EQ(Animation::Starting,

@@ -1407,7 +1417,7 @@ TEST(LayerAnimationControllerTest, InactiveObserverGetsTicked) {

// Now that an active observer has been added, the animation should still

// initially tick at its starting point, but should now progress to Running.

- controller->Animate(kInitialTickTime + 3.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 3.0));

controller->UpdateState(true, events.get());

EXPECT_EQ(1u, events->size());

EXPECT_EQ(Animation::Running,

@@ -1416,7 +1426,7 @@ TEST(LayerAnimationControllerTest, InactiveObserverGetsTicked) {

EXPECT_EQ(0.5f, dummy.opacity());

// The animation should now tick past its starting point.

- controller->Animate(kInitialTickTime + 3.5);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 3.5));

EXPECT_NE(0.5f, inactive_dummy.opacity());

EXPECT_NE(0.5f, dummy.opacity());

}

@@ -1522,9 +1532,9 @@ TEST(LayerAnimationControllerTest, AbortAnimations) {

Animation::Opacity));

- controller->Animate(kInitialTickTime);

+ controller->Animate(GetTimeTicks(kInitialTickTime));

controller->UpdateState(true, NULL);

- controller->Animate(kInitialTickTime + 1.0);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 1.0));

controller->UpdateState(true, NULL);

EXPECT_EQ(Animation::Finished,

@@ -1576,7 +1586,7 @@ TEST(LayerAnimationControllerTest, MainThreadAbortedAnimationGetsDeleted) {

EXPECT_FALSE(dummy.animation_waiting_for_deletion());

EXPECT_FALSE(dummy_impl.animation_waiting_for_deletion());

- controller->Animate(kInitialTickTime);

+ controller->Animate(GetTimeTicks(kInitialTickTime));

controller->UpdateState(true, NULL);

EXPECT_TRUE(dummy.animation_waiting_for_deletion());

EXPECT_EQ(Animation::WaitingForDeletion,

@@ -1611,7 +1621,7 @@ TEST(LayerAnimationControllerTest, ImplThreadAbortedAnimationGetsDeleted) {

EXPECT_FALSE(dummy_impl.animation_waiting_for_deletion());

AnimationEventsVector events;

- controller_impl->Animate(kInitialTickTime);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime));

controller_impl->UpdateState(true, &events);

EXPECT_TRUE(dummy_impl.animation_waiting_for_deletion());

EXPECT_EQ(1u, events.size());

@@ -1623,7 +1633,7 @@ TEST(LayerAnimationControllerTest, ImplThreadAbortedAnimationGetsDeleted) {

EXPECT_EQ(Animation::Aborted,

controller->GetAnimation(Animation::Opacity)->run_state());

- controller->Animate(kInitialTickTime + 0.5);

+ controller->Animate(GetTimeTicks(kInitialTickTime + 0.5));

controller->UpdateState(true, NULL);

EXPECT_TRUE(dummy.animation_waiting_for_deletion());

EXPECT_EQ(Animation::WaitingForDeletion,

@@ -1654,7 +1664,7 @@ TEST(LayerAnimationControllerTest, FinishedEventsForGroup) {

Animation::Opacity));

- controller_impl->Animate(kInitialTickTime);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime));

controller_impl->UpdateState(true, events.get());

// Both animations should have started.

@@ -1663,7 +1673,7 @@ TEST(LayerAnimationControllerTest, FinishedEventsForGroup) {

EXPECT_EQ(AnimationEvent::Started, (*events)[1].type);

events.reset(new AnimationEventsVector);

- controller_impl->Animate(kInitialTickTime + 1.0);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime + 1.0));

controller_impl->UpdateState(true, events.get());

// The opacity animation should be finished, but should not have generated

@@ -1675,7 +1685,7 @@ TEST(LayerAnimationControllerTest, FinishedEventsForGroup) {

controller_impl->GetAnimation(1,

Animation::Transform)->run_state());

- controller_impl->Animate(kInitialTickTime + 2.0);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime + 2.0));

controller_impl->UpdateState(true, events.get());

// Both animations should have generated Finished events.

@@ -1705,7 +1715,7 @@ TEST(LayerAnimationControllerTest, FinishedAndAbortedEventsForGroup) {

Animation::Opacity));

- controller_impl->Animate(kInitialTickTime);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime));

controller_impl->UpdateState(true, events.get());

// Both animations should have started.

@@ -1716,7 +1726,7 @@ TEST(LayerAnimationControllerTest, FinishedAndAbortedEventsForGroup) {

controller_impl->AbortAnimations(Animation::Opacity);

events.reset(new AnimationEventsVector);

- controller_impl->Animate(kInitialTickTime + 1.0);

+ controller_impl->Animate(GetTimeTicks(kInitialTickTime + 1.0));

controller_impl->UpdateState(true, events.get());

// We should have exactly 2 events: a Finished event for the tranform

« cc/animation/animation.h ('K') | « cc/animation/layer_animation_controller.cc ('k') | cc/input/page_scale_animation.h » ('j') | cc/layers/layer.cc » ('J')