Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/paint/PaintLayerStackingNode.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 30 matching lines @@
  * version of this file under any of the LGPL, the MPL or the GPL.
  */
 
 #include "core/paint/PaintLayerStackingNode.h"
 
 #include "core/layout/LayoutMultiColumnFlowThread.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
 #include "core/paint/PaintLayer.h"
 #include "public/platform/Platform.h"
-#include "wtf/PtrUtil.h"
 #include <algorithm>
-#include <memory>
 
 namespace blink {
 
 // FIXME: This should not require PaintLayer. There is currently a cycle where
 // in order to determine if we isStacked() we have to ask the paint
 // layer about some of its state.
 PaintLayerStackingNode::PaintLayerStackingNode(PaintLayer* layer)
     : m_layer(layer)
 #if ENABLE(ASSERT)
     , m_layerListMutationAllowed(true)
@@ skipping 79 matching lines @@
         // If the viewport is paginated, everything (including "top-layer" elements) gets
         // redirected to the flow thread. So that's where we have to look, in that case.
         if (LayoutBlockFlow* multiColumnFlowThread = rootBlock->multiColumnFlowThread())
             rootBlock = multiColumnFlowThread;
         for (LayoutObject* child = rootBlock->firstChild(); child; child = child->nextSibling()) {
             Element* childElement = (child->node() && child->node()->isElementNode()) ? toElement(child->node()) : 0;
             if (childElement && childElement->isInTopLayer()) {
                 PaintLayer* layer = toLayoutBoxModelObject(child)->layer();
                 // Create the buffer if it doesn't exist yet.
                 if (!m_posZOrderList)
-                    m_posZOrderList = wrapUnique(new Vector<PaintLayerStackingNode*>);
+                    m_posZOrderList = adoptPtr(new Vector<PaintLayerStackingNode*>);
                 m_posZOrderList->append(layer->stackingNode());
             }
         }
     }
 
 #if ENABLE(ASSERT)
     updateStackingParentForZOrderLists(this);
 #endif
 
     m_zOrderListsDirty = false;
 }
 
-void PaintLayerStackingNode::collectLayers(std::unique_ptr<Vector<PaintLayerStackingNode*>>& posBuffer, std::unique_ptr<Vector<PaintLayerStackingNode*>>& negBuffer)
+void PaintLayerStackingNode::collectLayers(OwnPtr<Vector<PaintLayerStackingNode*>>& posBuffer, OwnPtr<Vector<PaintLayerStackingNode*>>& negBuffer)
 {
     if (layer()->isInTopLayer())
         return;
 
     if (isStacked()) {
-        std::unique_ptr<Vector<PaintLayerStackingNode*>>& buffer = (zIndex() >= 0) ? posBuffer : negBuffer;
+        OwnPtr<Vector<PaintLayerStackingNode*>>& buffer = (zIndex() >= 0) ? posBuffer : negBuffer;
         if (!buffer)
-            buffer = wrapUnique(new Vector<PaintLayerStackingNode*>);
+            buffer = adoptPtr(new Vector<PaintLayerStackingNode*>);
         buffer->append(this);
     }
 
     if (!isStackingContext()) {
         for (PaintLayer* child = layer()->firstChild(); child; child = child->nextSibling()) {
             if (!layer()->reflectionInfo() || layer()->reflectionInfo()->reflectionLayer() != child)
                 child->stackingNode()->collectLayers(posBuffer, negBuffer);
         }
     }
 }
@@ skipping 72 matching lines @@
     }
     return 0;
 }
 
 LayoutBoxModelObject* PaintLayerStackingNode::layoutObject() const
 {
     return m_layer->layoutObject();
 }
 
 } // namespace blink