| 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..9fa238e4c5934662074d9cafb9e481f3bbd908f3 100644
|
| --- a/cc/animation/scroll_offset_animation_curve_unittest.cc
|
| +++ b/cc/animation/scroll_offset_animation_curve_unittest.cc
|
| @@ -70,15 +70,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);
|
| }
|
| @@ -100,22 +107,26 @@ TEST(ScrollOffsetAnimationCurveTest, Clone) {
|
| EXPECT_EQ(duration_in_seconds, clone->Duration().InSecondsF());
|
|
|
| EXPECT_VECTOR2DF_EQ(initial_value,
|
| - clone->ToScrollOffsetAnimationCurve()->GetValue(-1.0));
|
| - EXPECT_VECTOR2DF_EQ(initial_value,
|
| - clone->ToScrollOffsetAnimationCurve()->GetValue(0.0));
|
| - EXPECT_VECTOR2DF_EQ(gfx::ScrollOffset(6.f, 30.f),
|
| clone->ToScrollOffsetAnimationCurve()->GetValue(
|
| - duration_in_seconds / 2.0));
|
| + base::TimeDelta::FromSecondsD(-1.0)));
|
| EXPECT_VECTOR2DF_EQ(
|
| - target_value,
|
| - clone->ToScrollOffsetAnimationCurve()->GetValue(duration_in_seconds));
|
| + initial_value,
|
| + clone->ToScrollOffsetAnimationCurve()->GetValue(base::TimeDelta()));
|
| + EXPECT_VECTOR2DF_EQ(
|
| + gfx::ScrollOffset(6.f, 30.f),
|
| + clone->ToScrollOffsetAnimationCurve()->GetValue(
|
| + base::TimeDelta::FromSecondsD(duration_in_seconds / 2.0)));
|
| EXPECT_VECTOR2DF_EQ(target_value,
|
| clone->ToScrollOffsetAnimationCurve()->GetValue(
|
| - duration_in_seconds + 1.0));
|
| + base::TimeDelta::FromSecondsD(duration_in_seconds)));
|
| + EXPECT_VECTOR2DF_EQ(
|
| + target_value,
|
| + clone->ToScrollOffsetAnimationCurve()->GetValue(
|
| + base::TimeDelta::FromSecondsD(duration_in_seconds + 1.0)));
|
|
|
| // Verify that the timing function was cloned correctly.
|
| gfx::ScrollOffset value = clone->ToScrollOffsetAnimationCurve()->GetValue(
|
| - duration_in_seconds / 4.0);
|
| + base::TimeDelta::FromSecondsD(duration_in_seconds / 4.0));
|
| EXPECT_NEAR(3.0333f, value.x(), 0.00015f);
|
| EXPECT_NEAR(37.4168f, value.y(), 0.00015f);
|
| }
|
| @@ -128,21 +139,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
|
|
|