Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp

 /*
  * Copyright (C) 2009 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 39 matching lines @@
 #include "public/platform/WebCompositorSupport.h"
 #include "public/platform/WebFloatPoint.h"
 #include "public/platform/WebFloatRect.h"
 #include "public/platform/WebLayer.h"
 #include "public/platform/WebPoint.h"
 #include "public/platform/WebSize.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/HashMap.h"
 #include "wtf/HashSet.h"
 #include "wtf/MathExtras.h"
-#include "wtf/PtrUtil.h"
 #include "wtf/text/StringUTF8Adaptor.h"
 #include "wtf/text/WTFString.h"
 #include <algorithm>
 #include <cmath>
-#include <memory>
 #include <utility>
 
 #ifndef NDEBUG
 #include <stdio.h>
 #endif
 
 namespace blink {
 
 static bool s_drawDebugRedFill = true;
 
@@ skipping 26 matching lines @@
 #endif
 };
 
 typedef HashMap<const GraphicsLayer*, PaintInvalidationTracking> PaintInvalidationTrackingMap;
 static PaintInvalidationTrackingMap& paintInvalidationTrackingMap()
 {
     DEFINE_STATIC_LOCAL(PaintInvalidationTrackingMap, map, ());
     return map;
 }
 
-std::unique_ptr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerClient* client)
+PassOwnPtr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerClient* client)
 {
-    return wrapUnique(new GraphicsLayer(client));
+    return adoptPtr(new GraphicsLayer(client));
 }
 
 GraphicsLayer::GraphicsLayer(GraphicsLayerClient* client)
     : m_client(client)
     , m_backgroundColor(Color::transparent)
     , m_opacity(1)
     , m_blendMode(WebBlendModeNormal)
     , m_hasTransformOrigin(false)
     , m_contentsOpaque(false)
     , m_shouldFlattenTransform(true)
@@ skipping 18 matching lines @@
     , m_contentsLayer(0)
     , m_contentsLayerId(0)
     , m_scrollableArea(nullptr)
     , m_3dRenderingContext(0)
 {
 #if ENABLE(ASSERT)
     if (m_client)
         m_client->verifyNotPainting();
 #endif
 
-    m_contentLayerDelegate = wrapUnique(new ContentLayerDelegate(this));
-    m_layer = wrapUnique(Platform::current()->compositorSupport()->createContentLayer(m_contentLayerDelegate.get()));
+    m_contentLayerDelegate = adoptPtr(new ContentLayerDelegate(this));
+    m_layer = adoptPtr(Platform::current()->compositorSupport()->createContentLayer(m_contentLayerDelegate.get()));
     m_layer->layer()->setDrawsContent(m_drawsContent && m_contentsVisible);
     m_layer->layer()->setLayerClient(this);
 }
 
 GraphicsLayer::~GraphicsLayer()
 {
     for (size_t i = 0; i < m_linkHighlights.size(); ++i)
         m_linkHighlights[i]->clearCurrentGraphicsLayer();
     m_linkHighlights.clear();
 
@@ skipping 985 matching lines @@
 
     if (image && skImage && image->isBitmapImage()) {
         if (respectImageOrientation == RespectImageOrientation) {
             ImageOrientation imageOrientation = toBitmapImage(image)->currentFrameOrientation();
             skImage = DragImage::resizeAndOrientImage(skImage.release(), imageOrientation);
         }
     }
 
     if (image && skImage) {
         if (!m_imageLayer) {
-            m_imageLayer = wrapUnique(Platform::current()->compositorSupport()->createImageLayer());
+            m_imageLayer = adoptPtr(Platform::current()->compositorSupport()->createImageLayer());
             registerContentsLayer(m_imageLayer->layer());
         }
         m_imageLayer->setImage(skImage.get());
         m_imageLayer->layer()->setOpaque(image->currentFrameKnownToBeOpaque());
         updateContentsRect();
     } else {
         if (m_imageLayer) {
             unregisterContentsLayer(m_imageLayer->layer());
             m_imageLayer.reset();
         }
     }
 
     setContentsTo(m_imageLayer ? m_imageLayer->layer() : 0);
 }
 
 WebLayer* GraphicsLayer::platformLayer() const
 {
     return m_layer->layer();
 }
 
 void GraphicsLayer::setFilters(const FilterOperations& filters)
 {
-    std::unique_ptr<CompositorFilterOperations> compositorFilters = CompositorFilterOperations::create();
+    OwnPtr<CompositorFilterOperations> compositorFilters = CompositorFilterOperations::create();
     SkiaImageFilterBuilder::buildFilterOperations(filters, compositorFilters.get());
     m_layer->layer()->setFilters(compositorFilters->asFilterOperations());
 }
 
 void GraphicsLayer::setBackdropFilters(const FilterOperations& filters)
 {
-    std::unique_ptr<CompositorFilterOperations> compositorFilters = CompositorFilterOperations::create();
+    OwnPtr<CompositorFilterOperations> compositorFilters = CompositorFilterOperations::create();
     SkiaImageFilterBuilder::buildFilterOperations(filters, compositorFilters.get());
     m_layer->layer()->setBackgroundFilters(compositorFilters->asFilterOperations());
 }
 
 void GraphicsLayer::setFilterQuality(SkFilterQuality filterQuality)
 {
     if (m_imageLayer)
         m_imageLayer->setNearestNeighbor(filterQuality == kNone_SkFilterQuality);
 }
 
@@ skipping 170 matching lines @@
 {
     if (!layer) {
         fprintf(stderr, "Cannot showGraphicsLayerTree for (nil).\n");
         return;
     }
 
     String output = layer->layerTreeAsText(blink::LayerTreeIncludesDebugInfo);
     fprintf(stderr, "%s\n", output.utf8().data());
 }
 #endif