Use std::unique_ptr to signal ownership transfer in WebCompositorSupport

third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp

 /*
  * Copyright (C) 2011 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 46 matching lines @@
 #include "platform/scroll/ScrollAnimatorBase.h"
 #include "platform/scroll/ScrollbarTheme.h"
 #include "platform/tracing/TraceEvent.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCompositorSupport.h"
 #include "public/platform/WebLayerPositionConstraint.h"
 #include "public/platform/WebLayerTreeView.h"
 #include "public/platform/WebScrollbarLayer.h"
 #include "public/platform/WebScrollbarThemeGeometry.h"
 #include "public/platform/WebScrollbarThemePainter.h"
-#include "wtf/PtrUtil.h"
 #include "wtf/text/StringBuilder.h"
 #include <memory>
+#include <utility>
 
 using blink::WebLayer;
 using blink::WebLayerPositionConstraint;
 using blink::WebRect;
 using blink::WebScrollbarLayer;
 using blink::WebVector;
 
 namespace {
 
 WebLayer* toWebLayer(blink::GraphicsLayer* layer) {
@@ skipping 222 matching lines @@
 
 static std::unique_ptr<WebScrollbarLayer> createScrollbarLayer(
     Scrollbar& scrollbar,
     float deviceScaleFactor) {
   ScrollbarTheme& theme = scrollbar.theme();
   WebScrollbarThemePainter painter(theme, scrollbar, deviceScaleFactor);
   std::unique_ptr<WebScrollbarThemeGeometry> geometry(
       WebScrollbarThemeGeometryNative::create(theme));
 
   std::unique_ptr<WebScrollbarLayer> scrollbarLayer =
-      wrapUnique(Platform::current()->compositorSupport()->createScrollbarLayer(
-          WebScrollbarImpl::create(&scrollbar), painter, geometry.release()));
+      Platform::current()->compositorSupport()->createScrollbarLayer(
+          WebScrollbarImpl::create(&scrollbar), painter, std::move(geometry));
   GraphicsLayer::registerContentsLayer(scrollbarLayer->layer());
   return scrollbarLayer;
 }
 
 std::unique_ptr<WebScrollbarLayer>
 ScrollingCoordinator::createSolidColorScrollbarLayer(
     ScrollbarOrientation orientation,
     int thumbThickness,
     int trackStart,
     bool isLeftSideVerticalScrollbar) {
   WebScrollbar::Orientation webOrientation =
       (orientation == HorizontalScrollbar) ? WebScrollbar::Horizontal
                                            : WebScrollbar::Vertical;
-  std::unique_ptr<WebScrollbarLayer> scrollbarLayer = wrapUnique(
+  std::unique_ptr<WebScrollbarLayer> scrollbarLayer =
       Platform::current()->compositorSupport()->createSolidColorScrollbarLayer(
           webOrientation, thumbThickness, trackStart,
-          isLeftSideVerticalScrollbar));
+          isLeftSideVerticalScrollbar);
   GraphicsLayer::registerContentsLayer(scrollbarLayer->layer());
   return scrollbarLayer;
 }
 
 static void detachScrollbarLayer(GraphicsLayer* scrollbarGraphicsLayer) {
   ASSERT(scrollbarGraphicsLayer);
 
   scrollbarGraphicsLayer->setContentsToPlatformLayer(nullptr);
   scrollbarGraphicsLayer->setDrawsContent(true);
 }
@@ skipping 888 matching lines @@
   if (frameIsScrollable != m_wasFrameScrollable)
     return true;
 
   if (WebLayer* scrollLayer =
           frameView ? toWebLayer(frameView->layerForScrolling()) : nullptr)
     return WebSize(frameView->contentsSize()) != scrollLayer->bounds();
   return false;
 }
 
 }  // namespace blink