Remove OwnPtr from Blink.

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

 /*
  * Copyright (c) 2011, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 23 matching lines @@
 #include "platform/TraceEvent.h"
 #include "platform/animation/CompositorAnimation.h"
 #include "platform/graphics/CompositorFactory.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/scroll/MainThreadScrollingReason.h"
 #include "platform/scroll/ScrollableArea.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCompositorSupport.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/PassRefPtr.h"
+#include "wtf/PtrUtil.h"
+#include <memory>
 
 namespace blink {
 
 namespace {
 
 WebLayer* toWebLayer(GraphicsLayer* layer)
 {
     return layer ? layer->platformLayer() : nullptr;
 }
 
@@ skipping 207 matching lines @@
     removeMainThreadScrollingReason();
 
     resetAnimationState();
 }
 
 bool ScrollAnimator::sendAnimationToCompositor()
 {
     if (m_scrollableArea->shouldScrollOnMainThread())
         return false;
 
-    OwnPtr<CompositorAnimation> animation = adoptPtr(
+    std::unique_ptr<CompositorAnimation> animation = wrapUnique(
         CompositorFactory::current().createAnimation(
             *m_animationCurve,
             CompositorTargetProperty::SCROLL_OFFSET));
     // Being here means that either there is an animation that needs
     // to be sent to the compositor, or an animation that needs to
     // be updated (a new scroll event before the previous animation
     // is finished). In either case, the start time is when the
     // first animation was initiated. This re-targets the animation
     // using the current time on main thread.
     animation->setStartTime(m_startTime);
 
     int animationId = animation->id();
     int animationGroupId = animation->group();
 
     bool sentToCompositor = addAnimation(std::move(animation));
     if (sentToCompositor) {
         m_runState = RunState::RunningOnCompositor;
         m_compositorAnimationId = animationId;
         m_compositorAnimationGroupId = animationGroupId;
     }
 
     return sentToCompositor;
 }
 
 void ScrollAnimator::createAnimationCurve()
 {
     DCHECK(!m_animationCurve);
-    m_animationCurve = adoptPtr(CompositorFactory::current().createScrollOffsetAnimationCurve(
+    m_animationCurve = wrapUnique(CompositorFactory::current().createScrollOffsetAnimationCurve(
         compositorOffsetFromBlinkOffset(m_targetOffset),
         m_lastGranularity == ScrollByPixel ?
             CompositorScrollOffsetAnimationCurve::ScrollDurationInverseDelta :
             CompositorScrollOffsetAnimationCurve::ScrollDurationConstant));
     m_animationCurve->setInitialValue(compositorOffsetFromBlinkOffset(currentPosition()));
 }
 
 void ScrollAnimator::updateCompositorAnimations()
 {
     ScrollAnimatorCompositorCoordinator::updateCompositorAnimations();
@@ skipping 108 matching lines @@
     // If there is already an animation running and the compositor asks to take
     // over an animation, do nothing to avoid judder.
     if (hasRunningAnimation())
         return;
 
     cc::ScrollOffsetAnimationCurve* scrollOffsetAnimationCurve =
         curve->ToScrollOffsetAnimationCurve();
     FloatPoint targetValue(scrollOffsetAnimationCurve->target_value().x(),
         scrollOffsetAnimationCurve->target_value().y());
     if (willAnimateToOffset(targetValue)) {
-        m_animationCurve = adoptPtr(
+        m_animationCurve = wrapUnique(
             CompositorFactory::current().createScrollOffsetAnimationCurve(
                 std::move(scrollOffsetAnimationCurve)));
         m_startTime = animationStartTime;
     }
 }
 
 void ScrollAnimator::cancelAnimation()
 {
     ScrollAnimatorCompositorCoordinator::cancelAnimation();
 }
@@ skipping 24 matching lines @@
     }
     return true;
 }
 
 DEFINE_TRACE(ScrollAnimator)
 {
     ScrollAnimatorBase::trace(visitor);
 }
 
 } // namespace blink