| Index: cc/blink/web_float_animation_curve_impl.cc
|
| diff --git a/cc/blink/web_float_animation_curve_impl.cc b/cc/blink/web_float_animation_curve_impl.cc
|
| index e5eee53eb872efd7b778b8808e90d75419888aa9..d85f57ce96859023edbc2f0561f4322fecd595af 100644
|
| --- a/cc/blink/web_float_animation_curve_impl.cc
|
| +++ b/cc/blink/web_float_animation_curve_impl.cc
|
| @@ -31,8 +31,9 @@ void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe) {
|
|
|
| void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe,
|
| TimingFunctionType type) {
|
| - curve_->AddKeyframe(cc::FloatKeyframe::Create(
|
| - keyframe.time, keyframe.value, CreateTimingFunction(type)));
|
| + curve_->AddKeyframe(
|
| + cc::FloatKeyframe::Create(base::TimeDelta::FromSecondsD(keyframe.time),
|
| + keyframe.value, CreateTimingFunction(type)));
|
| }
|
|
|
| void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe,
|
| @@ -41,8 +42,7 @@ void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe,
|
| double x2,
|
| double y2) {
|
| curve_->AddKeyframe(cc::FloatKeyframe::Create(
|
| - keyframe.time,
|
| - keyframe.value,
|
| + base::TimeDelta::FromSecondsD(keyframe.time), keyframe.value,
|
| cc::CubicBezierTimingFunction::Create(x1, y1, x2, y2)));
|
| }
|
|
|
| @@ -59,7 +59,7 @@ void WebFloatAnimationCurveImpl::setTimingFunction(double x1,
|
| }
|
|
|
| float WebFloatAnimationCurveImpl::getValue(double time) const {
|
| - return curve_->GetValue(time);
|
| + return curve_->GetValue(base::TimeDelta::FromSecondsD(time));
|
| }
|
|
|
| scoped_ptr<cc::AnimationCurve>
|
|
|