| Index: cc/animation/animation.h
|
| diff --git a/cc/animation/animation.h b/cc/animation/animation.h
|
| index 78564971e0aa0a5216c0e3bd42f5b29d195ae4a1..80c0763929ba046f21a265848a6fd17977dc3cd3 100644
|
| --- a/cc/animation/animation.h
|
| +++ b/cc/animation/animation.h
|
| @@ -142,7 +142,8 @@ class CC_EXPORT Animation {
|
|
|
| // Takes the given absolute time, and using the start time and the number
|
| // of iterations, returns the relative time in the current iteration.
|
| - double TrimTimeToCurrentIteration(base::TimeTicks monotonic_time) const;
|
| + base::TimeDelta TrimTimeToCurrentIteration(
|
| + base::TimeTicks monotonic_time) const;
|
|
|
| scoped_ptr<Animation> CloneAndInitialize(RunState initial_run_state) const;
|
|
|
| @@ -169,7 +170,7 @@ class CC_EXPORT Animation {
|
| int group_id,
|
| TargetProperty target_property);
|
|
|
| - double ConvertToActiveTime(base::TimeTicks monotonic_time) const;
|
| + base::TimeDelta ConvertToActiveTime(base::TimeTicks monotonic_time) const;
|
|
|
| scoped_ptr<AnimationCurve> curve_;
|
|
|
|
|