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

webkit/compositor_bindings/WebAnimationImpl.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 "WebAnimationImpl.h"
 
 #include "CCActiveAnimation.h"
 #include "CCAnimationCurve.h"
 #include "WebFloatAnimationCurveImpl.h"
 #include "WebTransformAnimationCurveImpl.h"
 #include <public/WebAnimation.h>
 #include <public/WebAnimationCurve.h>
 #include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
 
 using cc::CCActiveAnimation;
 
 namespace WebKit {
 
 WebAnimation* WebAnimation::create(const WebAnimationCurve& curve, TargetProperty targetProperty, int animationId)
 {
     return new WebAnimationImpl(curve, targetProperty, animationId, 0);
 }
 
 WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& webCurve, TargetProperty targetProperty, int animationId, int groupId)
 {
     static int nextAnimationId = 1;
     static int nextGroupId = 1;
     if (!animationId)
         animationId = nextAnimationId++;
     if (!groupId)
         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);
         curve = floatCurveImpl->cloneToCCAnimationCurve();
         break;
     }
     case WebAnimationCurve::AnimationCurveTypeTransform: {
         const WebTransformAnimationCurveImpl* transformCurveImpl = static_cast<const WebTransformAnimationCurveImpl*>(&webCurve);
         curve = transformCurveImpl->cloneToCCAnimationCurve();
         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()
 {
 }
 
 int WebAnimationImpl::id()
 {
     return m_animation->id();
 }
@@ skipping 36 matching lines @@
 bool WebAnimationImpl::alternatesDirection() const
 {
     return m_animation->alternatesDirection();
 }
 
 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