Revert 161133 - [cc] Use base ptr types for cc's CSS animation classes

cc/CCActiveAnimation.cpp

Index: cc/CCActiveAnimation.cpp
===================================================================
--- cc/CCActiveAnimation.cpp	(revision 161134)
+++ cc/CCActiveAnimation.cpp	(working copy)
@@ -42,13 +42,13 @@
 
 namespace cc {
 
-scoped_ptr<CCActiveAnimation> CCActiveAnimation::create(scoped_ptr<CCAnimationCurve> curve, int animationId, int groupId, TargetProperty targetProperty)
+PassOwnPtr<CCActiveAnimation> CCActiveAnimation::create(PassOwnPtr<CCAnimationCurve> curve, int animationId, int groupId, TargetProperty targetProperty)
 {
-    return make_scoped_ptr(new CCActiveAnimation(curve.Pass(), animationId, groupId, targetProperty));
+    return adoptPtr(new CCActiveAnimation(curve, animationId, groupId, targetProperty));
 }
 
-CCActiveAnimation::CCActiveAnimation(scoped_ptr<CCAnimationCurve> curve, int animationId, int groupId, TargetProperty targetProperty)
-    : m_curve(curve.Pass())
+CCActiveAnimation::CCActiveAnimation(PassOwnPtr<CCAnimationCurve> curve, int animationId, int groupId, TargetProperty targetProperty)
+    : m_curve(curve)
     , m_id(animationId)
     , m_group(groupId)
     , m_targetProperty(targetProperty)
@@ -180,14 +180,14 @@
     return trimmed;
 }
 
-scoped_ptr<CCActiveAnimation> CCActiveAnimation::clone(InstanceType instanceType) const
+PassOwnPtr<CCActiveAnimation> CCActiveAnimation::clone(InstanceType instanceType) const
 {
     return cloneAndInitialize(instanceType, m_runState, m_startTime);
 }
 
-scoped_ptr<CCActiveAnimation> CCActiveAnimation::cloneAndInitialize(InstanceType instanceType, RunState initialRunState, double startTime) const
+PassOwnPtr<CCActiveAnimation> CCActiveAnimation::cloneAndInitialize(InstanceType instanceType, RunState initialRunState, double startTime) const
 {
-    scoped_ptr<CCActiveAnimation> toReturn(new CCActiveAnimation(m_curve->clone(), m_id, m_group, m_targetProperty));
+    OwnPtr<CCActiveAnimation> toReturn(adoptPtr(new CCActiveAnimation(m_curve->clone(), m_id, m_group, m_targetProperty)));
     toReturn->m_runState = initialRunState;
     toReturn->m_iterations = m_iterations;
     toReturn->m_startTime = startTime;
@@ -196,7 +196,7 @@
     toReturn->m_timeOffset = m_timeOffset;
     toReturn->m_alternatesDirection = m_alternatesDirection;
     toReturn->m_isControllingInstance = instanceType == ControllingInstance;
-    return toReturn.Pass();
+    return toReturn.release();
 }
 
 void CCActiveAnimation::pushPropertiesTo(CCActiveAnimation* other) const