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

webkit/compositor_bindings/WebFloatAnimationCurveImpl.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 "WebFloatAnimationCurveImpl.h"
 
 #include "CCAnimationCurve.h"
 #include "CCKeyframedAnimationCurve.h"
 #include "CCTimingFunction.h"
 #include "WebAnimationCurveCommon.h"
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
 
 namespace WebKit {
 
 WebFloatAnimationCurve* WebFloatAnimationCurve::create()
 {
     return new WebFloatAnimationCurveImpl();
 }
 
 WebFloatAnimationCurveImpl::WebFloatAnimationCurveImpl()
     : m_curve(cc::CCKeyframedFloatAnimationCurve::create())
@@ skipping 14 matching lines @@
     add(keyframe, TimingFunctionTypeEase);
 }
 
 void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe, TimingFunctionType type)
 {
     m_curve->addKeyframe(cc::CCFloatKeyframe::create(keyframe.time, keyframe.value, createTimingFunction(type)));
 }
 
 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
 {
     return m_curve->getValue(time);
 }
 
-scoped_ptr<cc::CCAnimationCurve> WebFloatAnimationCurveImpl::cloneToCCAnimationCurve() const
+PassOwnPtr<cc::CCAnimationCurve> WebFloatAnimationCurveImpl::cloneToCCAnimationCurve() const
 {
     return m_curve->clone();
 }
 
 } // namespace WebKit