Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/layout/FloatingObjects.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 10 matching lines @@
  * Boston, MA 02110-1301, USA.
  */
 
 #ifndef FloatingObjects_h
 #define FloatingObjects_h
 
 #include "platform/PODFreeListArena.h"
 #include "platform/PODIntervalTree.h"
 #include "platform/geometry/LayoutRect.h"
 #include "wtf/ListHashSet.h"
-#include <memory>
+#include "wtf/OwnPtr.h"
 
 namespace blink {
 
 class LayoutBlockFlow;
 class LayoutBox;
 class RootInlineBox;
 
 class FloatingObject {
     WTF_MAKE_NONCOPYABLE(FloatingObject); USING_FAST_MALLOC(FloatingObject);
 public:
 #ifndef NDEBUG
     // Used by the PODIntervalTree for debugging the FloatingObject.
     template <class> friend struct ValueToString;
 #endif
 
     // Note that Type uses bits so you can use FloatLeftRight as a mask to query for both left and right.
     enum Type { FloatLeft = 1, FloatRight = 2, FloatLeftRight = 3 };
 
-    static std::unique_ptr<FloatingObject> create(LayoutBox*);
+    static PassOwnPtr<FloatingObject> create(LayoutBox*);
 
-    std::unique_ptr<FloatingObject> copyToNewContainer(LayoutSize, bool shouldPaint = false, bool isDescendant = false) const;
+    PassOwnPtr<FloatingObject> copyToNewContainer(LayoutSize, bool shouldPaint = false, bool isDescendant = false) const;
 
-    std::unique_ptr<FloatingObject> unsafeClone() const;
+    PassOwnPtr<FloatingObject> unsafeClone() const;
 
     Type getType() const { return static_cast<Type>(m_type); }
     LayoutBox* layoutObject() const { return m_layoutObject; }
 
     bool isPlaced() const { return m_isPlaced; }
     void setIsPlaced(bool placed = true) { m_isPlaced = placed; }
 
     LayoutUnit x() const { ASSERT(isPlaced()); return m_frameRect.x(); }
     LayoutUnit maxX() const { ASSERT(isPlaced()); return m_frameRect.maxX(); }
     LayoutUnit y() const { ASSERT(isPlaced()); return m_frameRect.y(); }
@@ skipping 40 matching lines @@
     unsigned m_isPlaced : 1;
     unsigned m_isLowestNonOverhangingFloatInChild : 1;
 #if ENABLE(ASSERT)
     unsigned m_isInPlacedTree : 1;
 #endif
 };
 
 struct FloatingObjectHashFunctions {
     STATIC_ONLY(FloatingObjectHashFunctions);
     static unsigned hash(FloatingObject* key) { return DefaultHash<LayoutBox*>::Hash::hash(key->layoutObject()); }
-    static unsigned hash(const std::unique_ptr<FloatingObject>& key) { return hash(key.get()); }
-    static bool equal(std::unique_ptr<FloatingObject>& a, FloatingObject* b) { return a->layoutObject() == b->layoutObject(); }
-    static bool equal(std::unique_ptr<FloatingObject>& a, const std::unique_ptr<FloatingObject>& b) { return equal(a, b.get()); }
+    static unsigned hash(const OwnPtr<FloatingObject>& key) { return hash(key.get()); }
+    static bool equal(OwnPtr<FloatingObject>& a, FloatingObject* b) { return a->layoutObject() == b->layoutObject(); }
+    static bool equal(OwnPtr<FloatingObject>& a, const OwnPtr<FloatingObject>& b) { return equal(a, b.get()); }
 
     static const bool safeToCompareToEmptyOrDeleted = true;
 };
 struct FloatingObjectHashTranslator {
     STATIC_ONLY(FloatingObjectHashTranslator);
     static unsigned hash(LayoutBox* key) { return DefaultHash<LayoutBox*>::Hash::hash(key); }
     static bool equal(FloatingObject* a, LayoutBox* b) { return a->layoutObject() == b; }
-    static bool equal(const std::unique_ptr<FloatingObject>& a, LayoutBox* b) { return a->layoutObject() == b; }
+    static bool equal(const OwnPtr<FloatingObject>& a, LayoutBox* b) { return a->layoutObject() == b; }
 };
-typedef ListHashSet<std::unique_ptr<FloatingObject>, 4, FloatingObjectHashFunctions> FloatingObjectSet;
+typedef ListHashSet<OwnPtr<FloatingObject>, 4, FloatingObjectHashFunctions> FloatingObjectSet;
 typedef FloatingObjectSet::const_iterator FloatingObjectSetIterator;
 typedef PODInterval<LayoutUnit, FloatingObject*> FloatingObjectInterval;
 typedef PODIntervalTree<LayoutUnit, FloatingObject*> FloatingObjectTree;
 typedef PODFreeListArena<PODRedBlackTree<FloatingObjectInterval>::Node> IntervalArena;
-typedef HashMap<LayoutBox*, std::unique_ptr<FloatingObject>> LayoutBoxToFloatInfoMap;
+typedef HashMap<LayoutBox*, OwnPtr<FloatingObject>> LayoutBoxToFloatInfoMap;
 
 class FloatingObjects {
     WTF_MAKE_NONCOPYABLE(FloatingObjects); USING_FAST_MALLOC(FloatingObjects);
 public:
     FloatingObjects(const LayoutBlockFlow*, bool horizontalWritingMode);
     ~FloatingObjects();
 
     void clear();
     void moveAllToFloatInfoMap(LayoutBoxToFloatInfoMap&);
-    FloatingObject* add(std::unique_ptr<FloatingObject>);
+    FloatingObject* add(PassOwnPtr<FloatingObject>);
     void remove(FloatingObject*);
     void addPlacedObject(FloatingObject&);
     void removePlacedObject(FloatingObject&);
     void setHorizontalWritingMode(bool b = true) { m_horizontalWritingMode = b; }
 
     bool hasLeftObjects() const { return m_leftObjectsCount > 0; }
     bool hasRightObjects() const { return m_rightObjectsCount > 0; }
     const FloatingObjectSet& set() const { return m_set; }
     FloatingObjectSet& mutableSet() { return m_set; }
     void clearLineBoxTreePointers();
@@ skipping 48 matching lines @@
     static String toString(const LayoutUnit value);
 };
 template<> struct ValueToString<FloatingObject*> {
     static String toString(const FloatingObject*);
 };
 #endif
 
 } // namespace blink
 
 #endif // FloatingObjects_h