diff options
author | behara.ms <behara.ms@samsung.com> | 2014-11-11 21:09:08 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-11-12 05:09:29 +0000 |
commit | 71ff07f3e8b5d1861877cefc046bcea53125c7f7 (patch) | |
tree | 5663ad8b541bfa8669fa530ff43a683cfb5956df /ui | |
parent | b70363420dbfe0825e96e3d025fb0bacb26ff2f4 (diff) | |
download | chromium_src-71ff07f3e8b5d1861877cefc046bcea53125c7f7.zip chromium_src-71ff07f3e8b5d1861877cefc046bcea53125c7f7.tar.gz chromium_src-71ff07f3e8b5d1861877cefc046bcea53125c7f7.tar.bz2 |
Make cc::Animation::TrimTimeToCurrentIteration and
cc::AnimationCurve::Duration use TimeTicks/TimeDelta to represent time.
This patch adds a new file time_util.h which adds new class TimeUtil.
This TimeUtil class holds helper functions to operate on TimeDelta
in double because base::TimeDelta class doesnot allow
multiply/divide operations in double.
Review URL: https://codereview.chromium.org/693883004
Cr-Commit-Position: refs/heads/master@{#303790}
Diffstat (limited to 'ui')
4 files changed, 9 insertions, 9 deletions
diff --git a/ui/compositor/float_animation_curve_adapter.cc b/ui/compositor/float_animation_curve_adapter.cc index 308fc1e..3b5e155 100644 --- a/ui/compositor/float_animation_curve_adapter.cc +++ b/ui/compositor/float_animation_curve_adapter.cc @@ -17,8 +17,8 @@ FloatAnimationCurveAdapter::FloatAnimationCurveAdapter( duration_(duration) { } -double FloatAnimationCurveAdapter::Duration() const { - return duration_.InSecondsF(); +base::TimeDelta FloatAnimationCurveAdapter::Duration() const { + return duration_; } scoped_ptr<cc::AnimationCurve> FloatAnimationCurveAdapter::Clone() const { diff --git a/ui/compositor/float_animation_curve_adapter.h b/ui/compositor/float_animation_curve_adapter.h index 1c7b8b3..88d5870 100644 --- a/ui/compositor/float_animation_curve_adapter.h +++ b/ui/compositor/float_animation_curve_adapter.h @@ -21,7 +21,7 @@ class FloatAnimationCurveAdapter : public cc::FloatAnimationCurve { ~FloatAnimationCurveAdapter() override {} // FloatAnimationCurve implementation. - double Duration() const override; + base::TimeDelta Duration() const override; scoped_ptr<cc::AnimationCurve> Clone() const override; float GetValue(double t) const override; diff --git a/ui/compositor/transform_animation_curve_adapter.cc b/ui/compositor/transform_animation_curve_adapter.cc index fa73140..2c11488 100644 --- a/ui/compositor/transform_animation_curve_adapter.cc +++ b/ui/compositor/transform_animation_curve_adapter.cc @@ -22,8 +22,8 @@ TransformAnimationCurveAdapter::TransformAnimationCurveAdapter( TransformAnimationCurveAdapter::~TransformAnimationCurveAdapter() { } -double TransformAnimationCurveAdapter::Duration() const { - return duration_.InSecondsF(); +base::TimeDelta TransformAnimationCurveAdapter::Duration() const { + return duration_; } scoped_ptr<cc::AnimationCurve> TransformAnimationCurveAdapter::Clone() const { @@ -86,8 +86,8 @@ InverseTransformCurveAdapter::InverseTransformCurveAdapter( InverseTransformCurveAdapter::~InverseTransformCurveAdapter() { } -double InverseTransformCurveAdapter::Duration() const { - return duration_.InSeconds(); +base::TimeDelta InverseTransformCurveAdapter::Duration() const { + return duration_; } scoped_ptr<cc::AnimationCurve> InverseTransformCurveAdapter::Clone() const { diff --git a/ui/compositor/transform_animation_curve_adapter.h b/ui/compositor/transform_animation_curve_adapter.h index 7aa318e..c08024d 100644 --- a/ui/compositor/transform_animation_curve_adapter.h +++ b/ui/compositor/transform_animation_curve_adapter.h @@ -25,7 +25,7 @@ class COMPOSITOR_EXPORT TransformAnimationCurveAdapter ~TransformAnimationCurveAdapter() override; // TransformAnimationCurve implementation. - double Duration() const override; + base::TimeDelta Duration() const override; scoped_ptr<AnimationCurve> Clone() const override; gfx::Transform GetValue(double t) const override; bool AnimatedBoundsForBox(const gfx::BoxF& box, @@ -55,7 +55,7 @@ class COMPOSITOR_EXPORT InverseTransformCurveAdapter ~InverseTransformCurveAdapter() override; - double Duration() const override; + base::TimeDelta Duration() const override; scoped_ptr<AnimationCurve> Clone() const override; gfx::Transform GetValue(double t) const override; bool AnimatedBoundsForBox(const gfx::BoxF& box, |