summaryrefslogtreecommitdiffstats
path: root/webkit/compositor_bindings/WebAnimationImpl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/compositor_bindings/WebAnimationImpl.cpp')
-rw-r--r--webkit/compositor_bindings/WebAnimationImpl.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/webkit/compositor_bindings/WebAnimationImpl.cpp b/webkit/compositor_bindings/WebAnimationImpl.cpp
index cf401e9..b915082 100644
--- a/webkit/compositor_bindings/WebAnimationImpl.cpp
+++ b/webkit/compositor_bindings/WebAnimationImpl.cpp
@@ -13,6 +13,7 @@
#include <public/WebAnimation.h>
#include <public/WebAnimationCurve.h>
#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
using cc::CCActiveAnimation;
@@ -33,7 +34,7 @@ WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& webCurve, TargetProp
groupId = nextGroupId++;
WebAnimationCurve::AnimationCurveType curveType = webCurve.type();
- scoped_ptr<cc::CCAnimationCurve> curve;
+ OwnPtr<cc::CCAnimationCurve> curve;
switch (curveType) {
case WebAnimationCurve::AnimationCurveTypeFloat: {
const WebFloatAnimationCurveImpl* floatCurveImpl = static_cast<const WebFloatAnimationCurveImpl*>(&webCurve);
@@ -46,7 +47,7 @@ WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& webCurve, TargetProp
break;
}
}
- m_animation = CCActiveAnimation::create(curve.Pass(), animationId, groupId, static_cast<cc::CCActiveAnimation::TargetProperty>(targetProperty));
+ m_animation = CCActiveAnimation::create(curve.release(), animationId, groupId, static_cast<cc::CCActiveAnimation::TargetProperty>(targetProperty));
}
WebAnimationImpl::~WebAnimationImpl()
@@ -103,11 +104,11 @@ void WebAnimationImpl::setAlternatesDirection(bool alternates)
m_animation->setAlternatesDirection(alternates);
}
-scoped_ptr<cc::CCActiveAnimation> WebAnimationImpl::cloneToCCAnimation()
+PassOwnPtr<cc::CCActiveAnimation> WebAnimationImpl::cloneToCCAnimation()
{
- scoped_ptr<cc::CCActiveAnimation> toReturn(m_animation->clone(cc::CCActiveAnimation::NonControllingInstance));
+ OwnPtr<cc::CCActiveAnimation> toReturn(m_animation->clone(cc::CCActiveAnimation::NonControllingInstance));
toReturn->setNeedsSynchronizedStartTime(true);
- return toReturn.Pass();
+ return toReturn.release();
}
} // namespace WebKit