Blink Compositor Animation: Use PassOwnPtr in CompositorFactory.

third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp

 // Copyright 2014 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 "platform/scroll/ProgrammaticScrollAnimator.h"
 
 #include "platform/animation/CompositorAnimation.h"
 #include "platform/animation/CompositorScrollOffsetAnimationCurve.h"
 #include "platform/geometry/IntPoint.h"
 #include "platform/graphics/CompositorFactory.h"
@@ skipping 34 matching lines @@
 void ProgrammaticScrollAnimator::scrollToOffsetWithoutAnimation(const FloatPoint& offset)
 {
     cancelAnimation();
     notifyPositionChanged(offset);
 }
 
 void ProgrammaticScrollAnimator::animateToOffset(FloatPoint offset)
 {
     m_startTime = 0.0;
     m_targetOffset = offset;
-    m_animationCurve = adoptPtr(CompositorFactory::current().createScrollOffsetAnimationCurve(
+    m_animationCurve = CompositorFactory::current().createScrollOffsetAnimationCurve(
         m_targetOffset,
         CompositorAnimationCurve::TimingFunctionTypeEaseInOut,
-        CompositorScrollOffsetAnimationCurve::ScrollDurationDeltaBased));
+        CompositorScrollOffsetAnimationCurve::ScrollDurationDeltaBased);
 
     m_scrollableArea->registerForAnimation();
     if (!m_scrollableArea->scheduleAnimation()) {
         resetAnimationState();
         notifyPositionChanged(IntPoint(offset.x(), offset.y()));
     }
     m_runState = RunState::WaitingToSendToCompositor;
 }
 
 void ProgrammaticScrollAnimator::cancelAnimation()
@@ skipping 38 matching lines @@
         if (m_runState == RunState::WaitingToCancelOnCompositor) {
             resetAnimationState();
             return;
         }
     }
 
     if (m_runState == RunState::WaitingToSendToCompositor) {
         bool sentToCompositor = false;
 
         if (!m_scrollableArea->shouldScrollOnMainThread()) {
-            OwnPtr<CompositorAnimation> animation = adoptPtr(CompositorFactory::current().createAnimation(*m_animationCurve, CompositorAnimation::TargetPropertyScrollOffset));
+            OwnPtr<CompositorAnimation> animation = CompositorFactory::current().createAnimation(*m_animationCurve, CompositorAnimation::TargetPropertyScrollOffset);
 
             int animationId = animation->id();
             int animationGroupId = animation->group();
 
             if (addAnimation(animation.release())) {
                 sentToCompositor = true;
                 m_runState = RunState::RunningOnCompositor;
                 m_compositorAnimationId = animationId;
                 m_compositorAnimationGroupId = animationGroupId;
             }
@@ skipping 35 matching lines @@
     ScrollAnimatorCompositorCoordinator::compositorAnimationFinished(groupId);
 }
 
 DEFINE_TRACE(ProgrammaticScrollAnimator)
 {
     visitor->trace(m_scrollableArea);
     ScrollAnimatorCompositorCoordinator::trace(visitor);
 }
 
 } // namespace blink