| Index: third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
|
| index 9254bcd7543d247f1bde258974d0d18653337882..8b5d8f770a59bc247643ceb51e527784e376fa36 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
|
| @@ -2184,7 +2184,7 @@ void LayoutBlockFlow::setMustDiscardMarginBefore(bool value) {
|
| return;
|
|
|
| if (!m_rareData)
|
| - m_rareData = wrapUnique(new LayoutBlockFlowRareData(this));
|
| + m_rareData = makeUnique<LayoutBlockFlowRareData>(this);
|
|
|
| m_rareData->m_discardMarginBefore = value;
|
| }
|
| @@ -2199,7 +2199,7 @@ void LayoutBlockFlow::setMustDiscardMarginAfter(bool value) {
|
| return;
|
|
|
| if (!m_rareData)
|
| - m_rareData = wrapUnique(new LayoutBlockFlowRareData(this));
|
| + m_rareData = makeUnique<LayoutBlockFlowRareData>(this);
|
|
|
| m_rareData->m_discardMarginAfter = value;
|
| }
|
| @@ -2258,7 +2258,7 @@ void LayoutBlockFlow::setMaxMarginBeforeValues(LayoutUnit pos, LayoutUnit neg) {
|
| 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);
|
| @@ -2269,7 +2269,7 @@ void LayoutBlockFlow::setMaxMarginAfterValues(LayoutUnit pos, LayoutUnit neg) {
|
| 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);
|
| @@ -4112,7 +4112,7 @@ void LayoutBlockFlow::setPaginationStrutPropagatedFromChild(LayoutUnit strut) {
|
| if (!m_rareData) {
|
| if (!strut)
|
| return;
|
| - m_rareData = wrapUnique(new LayoutBlockFlowRareData(this));
|
| + m_rareData = makeUnique<LayoutBlockFlowRareData>(this);
|
| }
|
| m_rareData->m_paginationStrutPropagatedFromChild = strut;
|
| }
|
| @@ -4121,7 +4121,7 @@ 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;
|
| }
|
| @@ -4273,7 +4273,7 @@ LayoutBlockFlow::LayoutBlockFlowRareData& LayoutBlockFlow::ensureRareData() {
|
| if (m_rareData)
|
| return *m_rareData;
|
|
|
| - m_rareData = wrapUnique(new LayoutBlockFlowRareData(this));
|
| + m_rareData = makeUnique<LayoutBlockFlowRareData>(this);
|
| return *m_rareData;
|
| }
|
|
|
|
|