| Index: cc/test/animation_test_common.h
|
| diff --git a/cc/test/animation_test_common.h b/cc/test/animation_test_common.h
|
| index 328ae840f2270c30dcb067241398a4eec8fb4566..a69f0c95f6e1df537bb82b2e0cd7a5d550ee7b1a 100644
|
| --- a/cc/test/animation_test_common.h
|
| +++ b/cc/test/animation_test_common.h
|
| @@ -26,12 +26,12 @@ class FakeFloatAnimationCurve : public FloatAnimationCurve {
|
| explicit FakeFloatAnimationCurve(double duration);
|
| ~FakeFloatAnimationCurve() override;
|
|
|
| - double Duration() const override;
|
| + base::TimeDelta Duration() const override;
|
| float GetValue(double now) const override;
|
| scoped_ptr<AnimationCurve> Clone() const override;
|
|
|
| private:
|
| - double duration_;
|
| + base::TimeDelta duration_;
|
| };
|
|
|
| class FakeTransformTransition : public TransformAnimationCurve {
|
| @@ -39,7 +39,7 @@ class FakeTransformTransition : public TransformAnimationCurve {
|
| explicit FakeTransformTransition(double duration);
|
| ~FakeTransformTransition() override;
|
|
|
| - double Duration() const override;
|
| + base::TimeDelta Duration() const override;
|
| gfx::Transform GetValue(double time) const override;
|
| bool AnimatedBoundsForBox(const gfx::BoxF& box,
|
| gfx::BoxF* bounds) const override;
|
| @@ -51,7 +51,7 @@ class FakeTransformTransition : public TransformAnimationCurve {
|
| scoped_ptr<AnimationCurve> Clone() const override;
|
|
|
| private:
|
| - double duration_;
|
| + base::TimeDelta duration_;
|
| };
|
|
|
| class FakeFloatTransition : public FloatAnimationCurve {
|
| @@ -59,13 +59,13 @@ class FakeFloatTransition : public FloatAnimationCurve {
|
| FakeFloatTransition(double duration, float from, float to);
|
| ~FakeFloatTransition() override;
|
|
|
| - double Duration() const override;
|
| + base::TimeDelta Duration() const override;
|
| float GetValue(double time) const override;
|
|
|
| scoped_ptr<AnimationCurve> Clone() const override;
|
|
|
| private:
|
| - double duration_;
|
| + base::TimeDelta duration_;
|
| float from_;
|
| float to_;
|
| };
|
|
|