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

cc/CCActiveAnimation.cpp

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "CCActiveAnimation.h"
 
 #include "CCAnimationCurve.h"
 #include "TraceEvent.h"
@@ skipping 24 matching lines @@
     "Transform",
     "Opacity"
 };
 
 COMPILE_ASSERT(static_cast<int>(cc::CCActiveAnimation::TargetPropertyEnumSize) == arraysize(s_targetPropertyNames), TargetProperty_names_match_enum);
 
 } // namespace
 
 namespace cc {
 
-PassOwnPtr<CCActiveAnimation> CCActiveAnimation::create(PassOwnPtr<CCAnimationCurve> curve, int animationId, int groupId, TargetProperty targetProperty)
+scoped_ptr<CCActiveAnimation> CCActiveAnimation::create(scoped_ptr<CCAnimationCurve> curve, int animationId, int groupId, TargetProperty targetProperty)
 {
-    return adoptPtr(new CCActiveAnimation(curve, animationId, groupId, targetProperty));
+    return make_scoped_ptr(new CCActiveAnimation(curve.Pass(), animationId, groupId, targetProperty));
 }
 
-CCActiveAnimation::CCActiveAnimation(PassOwnPtr<CCAnimationCurve> curve, int animationId, int groupId, TargetProperty targetProperty)
-    : m_curve(curve)
+CCActiveAnimation::CCActiveAnimation(scoped_ptr<CCAnimationCurve> curve, int animationId, int groupId, TargetProperty targetProperty)
+    : m_curve(curve.Pass())
     , m_id(animationId)
     , m_group(groupId)
     , m_targetProperty(targetProperty)
     , m_runState(WaitingForTargetAvailability)
     , m_iterations(1)
     , m_startTime(0)
     , m_alternatesDirection(false)
     , m_timeOffset(0)
     , m_needsSynchronizedStartTime(false)
     , m_suspended(false)
@@ skipping 111 matching lines @@
     // Calculate x where trimmed = x + n * m_curve->duration() for some positive integer n.
     trimmed = fmod(trimmed, m_curve->duration());
 
     // If we're alternating and on an odd iteration, reverse the direction.
     if (m_alternatesDirection && iteration % 2 == 1)
         return m_curve->duration() - trimmed;
 
     return trimmed;
 }
 
-PassOwnPtr<CCActiveAnimation> CCActiveAnimation::clone(InstanceType instanceType) const
+scoped_ptr<CCActiveAnimation> CCActiveAnimation::clone(InstanceType instanceType) const
 {
     return cloneAndInitialize(instanceType, m_runState, m_startTime);
 }
 
-PassOwnPtr<CCActiveAnimation> CCActiveAnimation::cloneAndInitialize(InstanceType instanceType, RunState initialRunState, double startTime) const
+scoped_ptr<CCActiveAnimation> CCActiveAnimation::cloneAndInitialize(InstanceType instanceType, RunState initialRunState, double startTime) const
 {
-    OwnPtr<CCActiveAnimation> toReturn(adoptPtr(new CCActiveAnimation(m_curve->clone(), m_id, m_group, m_targetProperty)));
+    scoped_ptr<CCActiveAnimation> toReturn(new CCActiveAnimation(m_curve->clone(), m_id, m_group, m_targetProperty));
     toReturn->m_runState = initialRunState;
     toReturn->m_iterations = m_iterations;
     toReturn->m_startTime = startTime;
     toReturn->m_pauseTime = m_pauseTime;
     toReturn->m_totalPausedTime = m_totalPausedTime;
     toReturn->m_timeOffset = m_timeOffset;
     toReturn->m_alternatesDirection = m_alternatesDirection;
     toReturn->m_isControllingInstance = instanceType == ControllingInstance;
-    return toReturn.release();
+    return toReturn.Pass();
 }
 
 void CCActiveAnimation::pushPropertiesTo(CCActiveAnimation* other) const
 {
     // Currently, we only push changes due to pausing and resuming animations on the main thread.
     if (m_runState == CCActiveAnimation::Paused || other->m_runState == CCActiveAnimation::Paused) {
         other->m_runState = m_runState;
         other->m_pauseTime = m_pauseTime;
         other->m_totalPausedTime = m_totalPausedTime;
     }
 }
 
 } // namespace cc