| Index: cc/animation/scroll_offset_animation_curve_unittest.cc
|
| diff --git a/cc/animation/scroll_offset_animation_curve_unittest.cc b/cc/animation/scroll_offset_animation_curve_unittest.cc
|
| index d57814e794e9470a22b557007a9af4f6885900d3..341f08f950dd687af5ae532dc7286daf02d33149 100644
|
| --- a/cc/animation/scroll_offset_animation_curve_unittest.cc
|
| +++ b/cc/animation/scroll_offset_animation_curve_unittest.cc
|
| @@ -5,6 +5,7 @@
|
| #include "cc/animation/scroll_offset_animation_curve.h"
|
|
|
| #include "cc/animation/timing_function.h"
|
| +#include "cc/base/time_util.h"
|
| #include "cc/test/geometry_test_utils.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -70,15 +71,22 @@ TEST(ScrollOffsetAnimationCurveTest, GetValue) {
|
| EXPECT_EQ(AnimationCurve::ScrollOffset, curve->Type());
|
| EXPECT_EQ(duration_in_seconds, curve->Duration().InSecondsF());
|
|
|
| - EXPECT_VECTOR2DF_EQ(initial_value, curve->GetValue(-1.0));
|
| - EXPECT_VECTOR2DF_EQ(initial_value, curve->GetValue(0.0));
|
| + EXPECT_VECTOR2DF_EQ(initial_value,
|
| + curve->GetValue(base::TimeDelta::FromSecondsD(-1.0)));
|
| + EXPECT_VECTOR2DF_EQ(initial_value, curve->GetValue(base::TimeDelta()));
|
| EXPECT_VECTOR2DF_EQ(gfx::ScrollOffset(6.f, 30.f),
|
| - curve->GetValue(duration_in_seconds / 2.0));
|
| - EXPECT_VECTOR2DF_EQ(target_value, curve->GetValue(duration_in_seconds));
|
| - EXPECT_VECTOR2DF_EQ(target_value, curve->GetValue(duration_in_seconds + 1.0));
|
| + curve->GetValue(base::TimeDelta::FromSecondsD(
|
| + duration_in_seconds / 2.0)));
|
| + EXPECT_VECTOR2DF_EQ(
|
| + target_value,
|
| + curve->GetValue(base::TimeDelta::FromSecondsD(duration_in_seconds)));
|
| + EXPECT_VECTOR2DF_EQ(target_value,
|
| + curve->GetValue(base::TimeDelta::FromSecondsD(
|
| + duration_in_seconds + 1.0)));
|
|
|
| // Verify that GetValue takes the timing function into account.
|
| - gfx::ScrollOffset value = curve->GetValue(duration_in_seconds / 4.0);
|
| + gfx::ScrollOffset value =
|
| + curve->GetValue(base::TimeDelta::FromSecondsD(duration_in_seconds / 4.0));
|
| EXPECT_NEAR(3.0333f, value.x(), 0.00015f);
|
| EXPECT_NEAR(37.4168f, value.y(), 0.00015f);
|
| }
|
| @@ -92,30 +100,31 @@ TEST(ScrollOffsetAnimationCurveTest, Clone) {
|
| target_value,
|
| EaseInOutTimingFunction::Create().Pass()));
|
| curve->SetInitialValue(initial_value);
|
| - double duration_in_seconds = curve->Duration().InSecondsF();
|
| + base::TimeDelta duration = curve->Duration();
|
|
|
| scoped_ptr<AnimationCurve> clone(curve->Clone().Pass());
|
|
|
| EXPECT_EQ(AnimationCurve::ScrollOffset, clone->Type());
|
| - EXPECT_EQ(duration_in_seconds, clone->Duration().InSecondsF());
|
| + EXPECT_EQ(duration, clone->Duration());
|
|
|
| EXPECT_VECTOR2DF_EQ(initial_value,
|
| - clone->ToScrollOffsetAnimationCurve()->GetValue(-1.0));
|
| - EXPECT_VECTOR2DF_EQ(initial_value,
|
| - clone->ToScrollOffsetAnimationCurve()->GetValue(0.0));
|
| + clone->ToScrollOffsetAnimationCurve()->GetValue(
|
| + base::TimeDelta::FromSecondsD(-1.0)));
|
| + EXPECT_VECTOR2DF_EQ(
|
| + initial_value,
|
| + clone->ToScrollOffsetAnimationCurve()->GetValue(base::TimeDelta()));
|
| EXPECT_VECTOR2DF_EQ(gfx::ScrollOffset(6.f, 30.f),
|
| clone->ToScrollOffsetAnimationCurve()->GetValue(
|
| - duration_in_seconds / 2.0));
|
| + TimeUtil::Scale(duration, 0.5f)));
|
| EXPECT_VECTOR2DF_EQ(
|
| - target_value,
|
| - clone->ToScrollOffsetAnimationCurve()->GetValue(duration_in_seconds));
|
| + target_value, clone->ToScrollOffsetAnimationCurve()->GetValue(duration));
|
| EXPECT_VECTOR2DF_EQ(target_value,
|
| clone->ToScrollOffsetAnimationCurve()->GetValue(
|
| - duration_in_seconds + 1.0));
|
| + duration + base::TimeDelta::FromSecondsD(1.f)));
|
|
|
| // Verify that the timing function was cloned correctly.
|
| gfx::ScrollOffset value = clone->ToScrollOffsetAnimationCurve()->GetValue(
|
| - duration_in_seconds / 4.0);
|
| + TimeUtil::Scale(duration, 0.25f));
|
| EXPECT_NEAR(3.0333f, value.x(), 0.00015f);
|
| EXPECT_NEAR(37.4168f, value.y(), 0.00015f);
|
| }
|
| @@ -128,21 +137,23 @@ TEST(ScrollOffsetAnimationCurveTest, UpdateTarget) {
|
| target_value, EaseInOutTimingFunction::Create().Pass()));
|
| curve->SetInitialValue(initial_value);
|
| EXPECT_EQ(1.0, curve->Duration().InSecondsF());
|
| - EXPECT_EQ(1800.0, curve->GetValue(0.5).y());
|
| - EXPECT_EQ(3600.0, curve->GetValue(1.0).y());
|
| + EXPECT_EQ(1800.0, curve->GetValue(base::TimeDelta::FromSecondsD(0.5)).y());
|
| + EXPECT_EQ(3600.0, curve->GetValue(base::TimeDelta::FromSecondsD(1.0)).y());
|
|
|
| curve->UpdateTarget(0.5, gfx::ScrollOffset(0.0, 9900.0));
|
|
|
| EXPECT_EQ(2.0, curve->Duration().InSecondsF());
|
| - EXPECT_EQ(1800.0, curve->GetValue(0.5).y());
|
| - EXPECT_NEAR(5566.49, curve->GetValue(1.0).y(), 0.01);
|
| - EXPECT_EQ(9900.0, curve->GetValue(2.0).y());
|
| + EXPECT_EQ(1800.0, curve->GetValue(base::TimeDelta::FromSecondsD(0.5)).y());
|
| + EXPECT_NEAR(5566.49, curve->GetValue(base::TimeDelta::FromSecondsD(1.0)).y(),
|
| + 0.01);
|
| + EXPECT_EQ(9900.0, curve->GetValue(base::TimeDelta::FromSecondsD(2.0)).y());
|
|
|
| curve->UpdateTarget(1.0, gfx::ScrollOffset(0.0, 7200.0));
|
|
|
| EXPECT_NEAR(1.674, curve->Duration().InSecondsF(), 0.01);
|
| - EXPECT_NEAR(5566.49, curve->GetValue(1.0).y(), 0.01);
|
| - EXPECT_EQ(7200.0, curve->GetValue(1.674).y());
|
| + EXPECT_NEAR(5566.49, curve->GetValue(base::TimeDelta::FromSecondsD(1.0)).y(),
|
| + 0.01);
|
| + EXPECT_EQ(7200.0, curve->GetValue(base::TimeDelta::FromSecondsD(1.674)).y());
|
| }
|
|
|
| } // namespace
|
|
|