Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/input/ScrollManager.cpp

 // Copyright 2016 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 "core/input/ScrollManager.h"
 
 #include "core/dom/DOMNodeIds.h"
 #include "core/events/GestureEvent.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/TopControls.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/input/EventHandler.h"
 #include "core/layout/LayoutPart.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/page/AutoscrollController.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/OverscrollController.h"
 #include "core/page/scrolling/ScrollState.h"
 #include "core/paint/PaintLayer.h"
 #include "platform/PlatformGestureEvent.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 
 namespace blink {
 
 namespace {
 
 // TODO(bokan): This method can go away once all scrolls happen through the
 // scroll customization path.
 void computeScrollChainForSingleNode(Node& node, std::deque<int>& scrollChain)
 {
@@ skipping 207 matching lines @@
     if (!node || !node->isElementNode() || !toElement(node)->getApplyScroll()) {
         *wasRootScroller = false;
         return box->scroll(granularity, delta);
     }
 
     // If there is an ApplyScroll callback, its because we placed one on the
     // root scroller to control top controls and overscroll. Invoke a scroll
     // using parts of the scroll customization framework on just this element.
     computeScrollChainForSingleNode(*node, m_currentScrollChain);
 
-    std::unique_ptr<ScrollStateData> scrollStateData = wrapUnique(new ScrollStateData());
+    OwnPtr<ScrollStateData> scrollStateData = adoptPtr(new ScrollStateData());
     scrollStateData->delta_x = delta.width();
     scrollStateData->delta_y = delta.height();
     scrollStateData->position_x = position.x();
     scrollStateData->position_y = position.y();
     // TODO(bokan): delta_granularity is meant to be the number of pixels per
     // unit of delta but we can't determine that until we get to the area we'll
     // scroll. This is a hack, we stuff the enum into the double value for
     // now.
     scrollStateData->delta_granularity = static_cast<double>(granularity);
     scrollStateData->velocity_x = velocity.width();
@@ skipping 59 matching lines @@
         if (RuntimeEnabledFeatures::scrollCustomizationEnabled())
             m_scrollGestureHandlingNode = m_frame->document()->documentElement();
         else
             return WebInputEventResult::NotHandled;
     }
     DCHECK(m_scrollGestureHandlingNode);
 
     passScrollGestureEventToWidget(gestureEvent, m_scrollGestureHandlingNode->layoutObject());
     if (RuntimeEnabledFeatures::scrollCustomizationEnabled()) {
         m_currentScrollChain.clear();
-        std::unique_ptr<ScrollStateData> scrollStateData = wrapUnique(new ScrollStateData());
+        OwnPtr<ScrollStateData> scrollStateData = adoptPtr(new ScrollStateData());
         scrollStateData->position_x = gestureEvent.position().x();
         scrollStateData->position_y = gestureEvent.position().y();
         scrollStateData->is_beginning = true;
         scrollStateData->from_user_input = true;
         scrollStateData->delta_consumed_for_scroll_sequence = m_deltaConsumedForScrollSequence;
         ScrollState* scrollState = ScrollState::create(std::move(scrollStateData));
         customizedScroll(*m_scrollGestureHandlingNode.get(), *scrollState);
     } else {
         if (m_frame->isMainFrame())
             m_frame->host()->topControls().scrollBegin();
@@ skipping 33 matching lines @@
                 // scroll customization enabled.
                 m_previousGestureScrolledNode = m_scrollGestureHandlingNode;
             }
             // FIXME: we should allow simultaneous scrolling of nested
             // iframes along perpendicular axes. See crbug.com/466991.
             m_deltaConsumedForScrollSequence = true;
             return result;
         }
 
         if (handleScrollCustomization) {
-            std::unique_ptr<ScrollStateData> scrollStateData = wrapUnique(new ScrollStateData());
+            OwnPtr<ScrollStateData> scrollStateData = adoptPtr(new ScrollStateData());
             scrollStateData->delta_x = delta.width();
             scrollStateData->delta_y = delta.height();
             scrollStateData->delta_granularity = ScrollByPrecisePixel;
             scrollStateData->velocity_x = velocity.width();
             scrollStateData->velocity_y = velocity.height();
             scrollStateData->should_propagate = !gestureEvent.preventPropagation();
             scrollStateData->is_in_inertial_phase = gestureEvent.inertialPhase() == ScrollInertialPhaseMomentum;
             scrollStateData->from_user_input = true;
             scrollStateData->delta_consumed_for_scroll_sequence = m_deltaConsumedForScrollSequence;
             ScrollState* scrollState = ScrollState::create(std::move(scrollStateData));
@@ skipping 44 matching lines @@
     return WebInputEventResult::NotHandled;
 }
 
 WebInputEventResult ScrollManager::handleGestureScrollEnd(const PlatformGestureEvent& gestureEvent)
 {
     Node* node = m_scrollGestureHandlingNode;
 
     if (node) {
         passScrollGestureEventToWidget(gestureEvent, node->layoutObject());
         if (RuntimeEnabledFeatures::scrollCustomizationEnabled()) {
-            std::unique_ptr<ScrollStateData> scrollStateData = wrapUnique(new ScrollStateData());
+            OwnPtr<ScrollStateData> scrollStateData = adoptPtr(new ScrollStateData());
             scrollStateData->is_ending = true;
             scrollStateData->is_in_inertial_phase = gestureEvent.inertialPhase() == ScrollInertialPhaseMomentum;
             scrollStateData->from_user_input = true;
             scrollStateData->is_direct_manipulation = true;
             scrollStateData->delta_consumed_for_scroll_sequence = m_deltaConsumedForScrollSequence;
             ScrollState* scrollState = ScrollState::create(std::move(scrollStateData));
             customizedScroll(*node, *scrollState);
         }
     }
 
@@ skipping 187 matching lines @@
 DEFINE_TRACE(ScrollManager)
 {
     visitor->trace(m_frame);
     visitor->trace(m_scrollGestureHandlingNode);
     visitor->trace(m_previousGestureScrolledNode);
     visitor->trace(m_scrollbarHandlingScrollGesture);
     visitor->trace(m_resizeScrollableArea);
 }
 
 } // namespace blink