| Index: cc/animation/animation_unittest.cc
|
| diff --git a/cc/animation/animation_unittest.cc b/cc/animation/animation_unittest.cc
|
| index ab9c909041a01edeb06ca22cbc42ae7ae02c436f..378bb7e92d442bafe7f9c70fe82f0a8473ea5223 100644
|
| --- a/cc/animation/animation_unittest.cc
|
| +++ b/cc/animation/animation_unittest.cc
|
| @@ -666,5 +666,51 @@ TEST(AnimationTest,
|
| EXPECT_EQ(1.0, anim->TrimTimeToCurrentIteration(TicksFromSecondsF(3.5)));
|
| }
|
|
|
| +TEST(AnimationTest, InEffectFillMode) {
|
| + scoped_ptr<Animation> anim(CreateAnimation(1));
|
| + anim->set_fill_mode(Animation::FillModeNone);
|
| + EXPECT_FALSE(anim->InEffect(TicksFromSecondsF(-1.0)));
|
| + EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(0.0)));
|
| + EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(1.0)));
|
| +
|
| + anim->set_fill_mode(Animation::FillModeForwards);
|
| + EXPECT_FALSE(anim->InEffect(TicksFromSecondsF(-1.0)));
|
| + EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(0.0)));
|
| + EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(1.0)));
|
| +
|
| + anim->set_fill_mode(Animation::FillModeBackwards);
|
| + EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(-1.0)));
|
| + EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(0.0)));
|
| + EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(1.0)));
|
| +
|
| + anim->set_fill_mode(Animation::FillModeBoth);
|
| + EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(-1.0)));
|
| + EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(0.0)));
|
| + EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(1.0)));
|
| +}
|
| +
|
| +TEST(AnimationTest, InEffectFillModePlayback) {
|
| + scoped_ptr<Animation> anim(CreateAnimation(1, 1, -1));
|
| + anim->set_fill_mode(Animation::FillModeNone);
|
| + EXPECT_FALSE(anim->InEffect(TicksFromSecondsF(-1.0)));
|
| + EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(0.0)));
|
| + EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(1.0)));
|
| +
|
| + anim->set_fill_mode(Animation::FillModeForwards);
|
| + EXPECT_FALSE(anim->InEffect(TicksFromSecondsF(-1.0)));
|
| + EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(0.0)));
|
| + EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(1.0)));
|
| +
|
| + anim->set_fill_mode(Animation::FillModeBackwards);
|
| + EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(-1.0)));
|
| + EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(0.0)));
|
| + EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(1.0)));
|
| +
|
| + anim->set_fill_mode(Animation::FillModeBoth);
|
| + EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(-1.0)));
|
| + EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(0.0)));
|
| + EXPECT_TRUE(anim->InEffect(TicksFromSecondsF(1.0)));
|
| +}
|
| +
|
| } // namespace
|
| } // namespace cc
|
|
|