summaryrefslogtreecommitdiffstats
path: root/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp')
-rw-r--r--webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp b/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp
index 8bce2ce..15351e1 100644
--- a/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp
+++ b/webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp
@@ -10,6 +10,8 @@
#include "CCKeyframedAnimationCurve.h"
#include "CCTimingFunction.h"
#include "WebAnimationCurveCommon.h"
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
namespace WebKit {
@@ -44,7 +46,7 @@ void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe, TimingFun
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::CCFloatKeyframe::create(keyframe.time, keyframe.value, cc::CCCubicBezierTimingFunction::create(x1, y1, x2, y2)));
}
float WebFloatAnimationCurveImpl::getValue(double time) const
@@ -52,7 +54,7 @@ float WebFloatAnimationCurveImpl::getValue(double time) const
return m_curve->getValue(time);
}
-scoped_ptr<cc::CCAnimationCurve> WebFloatAnimationCurveImpl::cloneToCCAnimationCurve() const
+PassOwnPtr<cc::CCAnimationCurve> WebFloatAnimationCurveImpl::cloneToCCAnimationCurve() const
{
return m_curve->clone();
}