| Index: webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp
|
| diff --git a/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp b/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp
|
| index e4e4d4ceaeaddc37099286e224ee6b5d313aa7f8..75ee5944e6ed9f2e060d97c3a8b28a127f7115c7 100644
|
| --- a/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp
|
| +++ b/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp
|
| @@ -19,7 +19,7 @@ WebFloatAnimationCurve* WebFloatAnimationCurve::create()
|
| }
|
|
|
| WebFloatAnimationCurveImpl::WebFloatAnimationCurveImpl()
|
| - : m_curve(cc::CCKeyframedFloatAnimationCurve::create())
|
| + : m_curve(cc::KeyframedFloatAnimationCurve::create())
|
| {
|
| }
|
|
|
| @@ -39,12 +39,12 @@ void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe)
|
|
|
| void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe, TimingFunctionType type)
|
| {
|
| - m_curve->addKeyframe(cc::CCFloatKeyframe::create(keyframe.time, keyframe.value, createTimingFunction(type)));
|
| + m_curve->addKeyframe(cc::FloatKeyframe::create(keyframe.time, keyframe.value, createTimingFunction(type)));
|
| }
|
|
|
| void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe, double x1, double y1, double x2, double y2)
|
| {
|
| - m_curve->addKeyframe(cc::CCFloatKeyframe::create(keyframe.time, keyframe.value, cc::CCCubicBezierTimingFunction::create(x1, y1, x2, y2).PassAs<cc::CCTimingFunction>()));
|
| + m_curve->addKeyframe(cc::FloatKeyframe::create(keyframe.time, keyframe.value, cc::CubicBezierTimingFunction::create(x1, y1, x2, y2).PassAs<cc::TimingFunction>()));
|
| }
|
|
|
| float WebFloatAnimationCurveImpl::getValue(double time) const
|
| @@ -52,7 +52,7 @@ float WebFloatAnimationCurveImpl::getValue(double time) const
|
| return m_curve->getValue(time);
|
| }
|
|
|
| -scoped_ptr<cc::CCAnimationCurve> WebFloatAnimationCurveImpl::cloneToCCAnimationCurve() const
|
| +scoped_ptr<cc::AnimationCurve> WebFloatAnimationCurveImpl::cloneToAnimationCurve() const
|
| {
|
| return m_curve->clone();
|
| }
|
|
|