Replace wrapUnique(new T(args)) by makeUnique<T>(args) in 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 2166 matching lines @@
 void LayoutBlockFlow::setMustDiscardMarginBefore(bool value) {
   if (style()->marginBeforeCollapse() == MarginCollapseDiscard) {
     ASSERT(value);
     return;
   }
 
   if (!m_rareData && !value)
     return;
 
   if (!m_rareData)
-    m_rareData = wrapUnique(new LayoutBlockFlowRareData(this));
+    m_rareData = makeUnique<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 = makeUnique<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 38 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 = makeUnique<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 = makeUnique<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 1822 matching lines @@
   // This is a first in-flow child. We'll still allow the strut if it can be
   // re-propagated to our containing block.
   return containingBlockFlow->allowsPaginationStrut();
 }
 
 void LayoutBlockFlow::setPaginationStrutPropagatedFromChild(LayoutUnit strut) {
   strut = std::max(strut, LayoutUnit());
   if (!m_rareData) {
     if (!strut)
       return;
-    m_rareData = wrapUnique(new LayoutBlockFlowRareData(this));
+    m_rareData = makeUnique<LayoutBlockFlowRareData>(this);
   }
   m_rareData->m_paginationStrutPropagatedFromChild = strut;
 }
 
 void LayoutBlockFlow::setFirstForcedBreakOffset(LayoutUnit blockOffset) {
   if (!m_rareData) {
     if (!blockOffset)
       return;
-    m_rareData = wrapUnique(new LayoutBlockFlowRareData(this));
+    m_rareData = makeUnique<LayoutBlockFlowRareData>(this);
   }
   m_rareData->m_firstForcedBreakOffset = blockOffset;
 }
 
 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 131 matching lines @@
   flowThread->populate();
   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 = makeUnique<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 283 matching lines @@
   return LayoutBlock::invalidatePaintIfNeeded(paintInvalidationState);
 }
 
 void LayoutBlockFlow::invalidateDisplayItemClients(
     PaintInvalidationReason invalidationReason) const {
   BlockFlowPaintInvalidator(*this).invalidateDisplayItemClients(
       invalidationReason);
 }
 
 }  // namespace blink