Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp

 /*
  * Copyright (C) 2013 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 31 matching lines @@
 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h"
 #include "core/layout/LayoutPagedFlowThread.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/TextAutosizer.h"
 #include "core/layout/line/GlyphOverflow.h"
 #include "core/layout/line/InlineIterator.h"
 #include "core/layout/line/InlineTextBox.h"
 #include "core/layout/line/LineWidth.h"
 #include "core/layout/shapes/ShapeOutsideInfo.h"
 #include "core/paint/PaintLayer.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 namespace blink {
 
 bool LayoutBlockFlow::s_canPropagateFloatIntoSibling = false;
 
 struct SameSizeAsLayoutBlockFlow : public LayoutBlock {
     LineBoxList lineBoxes;
     LayoutUnit m_paintInvalidationLogicalTopAndBottom[2];
     void* pointers[2];
 };
@@ skipping 1055 matching lines @@
                     floatMap.remove(floatingObject.layoutObject());
                 } else {
                     changeLogicalTop = LayoutUnit();
                     changeLogicalBottom = std::max(changeLogicalBottom, logicalBottom);
                 }
             }
         }
 
         LayoutBoxToFloatInfoMap::iterator end = floatMap.end();
         for (LayoutBoxToFloatInfoMap::iterator it = floatMap.begin(); it != end; ++it) {
-            std::unique_ptr<FloatingObject>& floatingObject = it->value;
+            OwnPtr<FloatingObject>& floatingObject = it->value;
             if (!floatingObject->isDescendant()) {
                 changeLogicalTop = LayoutUnit();
                 changeLogicalBottom = std::max(changeLogicalBottom, logicalBottomForFloat(*floatingObject));
             }
         }
 
         markLinesDirtyInBlockRange(changeLogicalTop, changeLogicalBottom);
     } else if (!oldIntrudingFloatSet.isEmpty()) {
         // If there are previously intruding floats that no longer intrude, then children with floats
         // should also get layout because they might need their floating object lists cleared.
@@ skipping 617 matching lines @@
 {
     if (style()->marginBeforeCollapse() == MarginCollapseDiscard) {
         ASSERT(value);
         return;
     }
 
     if (!m_rareData && !value)
         return;
 
     if (!m_rareData)
-        m_rareData = wrapUnique(new LayoutBlockFlowRareData(this));
+        m_rareData = adoptPtr(new LayoutBlockFlowRareData(this));
 
     m_rareData->m_discardMarginBefore = value;
 }
 
 void LayoutBlockFlow::setMustDiscardMarginAfter(bool value)
 {
     if (style()->marginAfterCollapse() == MarginCollapseDiscard) {
         ASSERT(value);
         return;
     }
 
     if (!m_rareData && !value)
         return;
 
     if (!m_rareData)
-        m_rareData = wrapUnique(new LayoutBlockFlowRareData(this));
+        m_rareData = adoptPtr(new LayoutBlockFlowRareData(this));
 
     m_rareData->m_discardMarginAfter = value;
 }
 
 bool LayoutBlockFlow::mustDiscardMarginBefore() const
 {
     return style()->marginBeforeCollapse() == MarginCollapseDiscard || (m_rareData && m_rareData->m_discardMarginBefore);
 }
 
 bool LayoutBlockFlow::mustDiscardMarginAfter() const
@@ skipping 24 matching lines @@
 
     // FIXME: See |mustDiscardMarginBeforeForChild| above.
     return false;
 }
 
 void LayoutBlockFlow::setMaxMarginBeforeValues(LayoutUnit pos, LayoutUnit neg)
 {
     if (!m_rareData) {
         if (pos == LayoutBlockFlowRareData::positiveMarginBeforeDefault(this) && neg == LayoutBlockFlowRareData::negativeMarginBeforeDefault(this))
             return;
-        m_rareData = wrapUnique(new LayoutBlockFlowRareData(this));
+        m_rareData = adoptPtr(new LayoutBlockFlowRareData(this));
     }
     m_rareData->m_margins.setPositiveMarginBefore(pos);
     m_rareData->m_margins.setNegativeMarginBefore(neg);
 }
 
 void LayoutBlockFlow::setMaxMarginAfterValues(LayoutUnit pos, LayoutUnit neg)
 {
     if (!m_rareData) {
         if (pos == LayoutBlockFlowRareData::positiveMarginAfterDefault(this) && neg == LayoutBlockFlowRareData::negativeMarginAfterDefault(this))
             return;
-        m_rareData = wrapUnique(new LayoutBlockFlowRareData(this));
+        m_rareData = adoptPtr(new LayoutBlockFlowRareData(this));
     }
     m_rareData->m_margins.setPositiveMarginAfter(pos);
     m_rareData->m_margins.setNegativeMarginAfter(neg);
 }
 
 bool LayoutBlockFlow::mustSeparateMarginBeforeForChild(const LayoutBox& child) const
 {
     ASSERT(!child.selfNeedsLayout());
     const ComputedStyle& childStyle = child.styleRef();
     if (!child.isWritingModeRoot())
@@ skipping 343 matching lines @@
             if (newLogicalTop < logicalTop)
                 break;
         }
         ASSERT_NOT_REACHED();
     }
     return result;
 }
 
 void LayoutBlockFlow::createFloatingObjects()
 {
-    m_floatingObjects = wrapUnique(new FloatingObjects(this, isHorizontalWritingMode()));
+    m_floatingObjects = adoptPtr(new FloatingObjects(this, isHorizontalWritingMode()));
 }
 
 void LayoutBlockFlow::willBeDestroyed()
 {
     // Mark as being destroyed to avoid trouble with merges in removeChild().
     m_beingDestroyed = true;
 
     // Make sure to destroy anonymous children first while they are still connected to the rest of the tree, so that they will
     // properly dirty line boxes that they are removed from. Effects that do :before/:after only on hover could crash otherwise.
     children()->destroyLeftoverChildren();
@@ skipping 784 matching lines @@
     } else {
         // Don't insert the object again if it's already in the list
         const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set();
         FloatingObjectSetIterator it = floatingObjectSet.find<FloatingObjectHashTranslator>(&floatBox);
         if (it != floatingObjectSet.end())
             return it->get();
     }
 
     // Create the special object entry & append it to the list
 
-    std::unique_ptr<FloatingObject> newObj = FloatingObject::create(&floatBox);
+    OwnPtr<FloatingObject> newObj = FloatingObject::create(&floatBox);
 
     // Our location is irrelevant if we're unsplittable or no pagination is in effect.
     // Just go ahead and lay out the float.
     bool isChildLayoutBlock = floatBox.isLayoutBlock();
     if (isChildLayoutBlock && !floatBox.needsLayout() && view()->layoutState()->pageLogicalHeightChanged())
         floatBox.setChildNeedsLayout(MarkOnlyThis);
 
     floatBox.layoutIfNeeded();
 
     setLogicalWidthForFloat(*newObj, logicalWidthForChild(floatBox) + marginStartForChild(floatBox) + marginEndForChild(floatBox));
@@ skipping 437 matching lines @@
     LayoutBlock* containingBlock = this->containingBlock();
     return containingBlock && containingBlock->isLayoutBlockFlow();
 }
 
 void LayoutBlockFlow::setPaginationStrutPropagatedFromChild(LayoutUnit strut)
 {
     strut = std::max(strut, LayoutUnit());
     if (!m_rareData) {
         if (!strut)
             return;
-        m_rareData = wrapUnique(new LayoutBlockFlowRareData(this));
+        m_rareData = adoptPtr(new LayoutBlockFlowRareData(this));
     }
     m_rareData->m_paginationStrutPropagatedFromChild = strut;
 }
 
 void LayoutBlockFlow::positionSpannerDescendant(LayoutMultiColumnSpannerPlaceholder& child)
 {
     LayoutBox& spanner = *child.layoutObjectInFlowThread();
     // FIXME: |spanner| is a descendant, but never a direct child, so the names here are bad, if
     // nothing else.
     setLogicalTopForChild(spanner, child.logicalTop());
@@ skipping 121 matching lines @@
     LayoutBlockFlowRareData& rareData = ensureRareData();
     ASSERT(!rareData.m_multiColumnFlowThread);
     rareData.m_multiColumnFlowThread = flowThread;
 }
 
 LayoutBlockFlow::LayoutBlockFlowRareData& LayoutBlockFlow::ensureRareData()
 {
     if (m_rareData)
         return *m_rareData;
 
-    m_rareData = wrapUnique(new LayoutBlockFlowRareData(this));
+    m_rareData = adoptPtr(new LayoutBlockFlowRareData(this));
     return *m_rareData;
 }
 
 void LayoutBlockFlow::positionDialog()
 {
     HTMLDialogElement* dialog = toHTMLDialogElement(node());
     if (dialog->getCenteringMode() == HTMLDialogElement::NotCentered)
         return;
 
     bool canCenterDialog = (style()->position() == AbsolutePosition || style()->position() == FixedPosition)
@@ skipping 212 matching lines @@
             if (!rect.isEmpty())
                 rects.append(rect);
         }
     }
 
     if (inlineElementContinuation)
         inlineElementContinuation->addOutlineRects(rects, additionalOffset + (inlineElementContinuation->containingBlock()->location() - location()), includeBlockOverflows);
 }
 
 } // namespace blink