Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1409)

Unified Diff: Source/core/rendering/RenderBlockFlow.cpp

Issue 869323003: Oilpan: move RenderObjects off heap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: review-induced improvements Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderBlockFlow.h ('k') | Source/core/rendering/RenderBoxModelObject.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBlockFlow.cpp
diff --git a/Source/core/rendering/RenderBlockFlow.cpp b/Source/core/rendering/RenderBlockFlow.cpp
index 5394e233b7f588b4d77ecbfae29f3730f0b091ce..f5b0c66a6662ae61774baff8442eb208065bc329 100644
--- a/Source/core/rendering/RenderBlockFlow.cpp
+++ b/Source/core/rendering/RenderBlockFlow.cpp
@@ -159,11 +159,6 @@ static bool inNormalFlow(RenderBox* child)
return true;
}
-void RenderBlockFlow::RenderBlockFlowRareData::trace(Visitor* visitor)
-{
- visitor->trace(m_multiColumnFlowThread);
-}
-
RenderBlockFlow::RenderBlockFlow(ContainerNode* node)
: RenderBlock(node)
{
@@ -175,12 +170,6 @@ RenderBlockFlow::~RenderBlockFlow()
{
}
-void RenderBlockFlow::trace(Visitor* visitor)
-{
- visitor->trace(m_rareData);
- RenderBlock::trace(visitor);
-}
-
RenderBlockFlow* RenderBlockFlow::createAnonymous(Document* document)
{
RenderBlockFlow* renderer = new RenderBlockFlow(0);
@@ -1630,7 +1619,7 @@ void RenderBlockFlow::setMustDiscardMarginBefore(bool value)
return;
if (!m_rareData)
- m_rareData = adoptPtrWillBeNoop(new RenderBlockFlowRareData(this));
+ m_rareData = adoptPtr(new RenderBlockFlowRareData(this));
m_rareData->m_discardMarginBefore = value;
}
@@ -1646,7 +1635,7 @@ void RenderBlockFlow::setMustDiscardMarginAfter(bool value)
return;
if (!m_rareData)
- m_rareData = adoptPtrWillBeNoop(new RenderBlockFlowRareData(this));
+ m_rareData = adoptPtr(new RenderBlockFlowRareData(this));
m_rareData->m_discardMarginAfter = value;
}
@@ -1691,7 +1680,7 @@ void RenderBlockFlow::setMaxMarginBeforeValues(LayoutUnit pos, LayoutUnit neg)
if (!m_rareData) {
if (pos == RenderBlockFlowRareData::positiveMarginBeforeDefault(this) && neg == RenderBlockFlowRareData::negativeMarginBeforeDefault(this))
return;
- m_rareData = adoptPtrWillBeNoop(new RenderBlockFlowRareData(this));
+ m_rareData = adoptPtr(new RenderBlockFlowRareData(this));
}
m_rareData->m_margins.setPositiveMarginBefore(pos);
m_rareData->m_margins.setNegativeMarginBefore(neg);
@@ -1702,7 +1691,7 @@ void RenderBlockFlow::setMaxMarginAfterValues(LayoutUnit pos, LayoutUnit neg)
if (!m_rareData) {
if (pos == RenderBlockFlowRareData::positiveMarginAfterDefault(this) && neg == RenderBlockFlowRareData::negativeMarginAfterDefault(this))
return;
- m_rareData = adoptPtrWillBeNoop(new RenderBlockFlowRareData(this));
+ m_rareData = adoptPtr(new RenderBlockFlowRareData(this));
}
m_rareData->m_margins.setPositiveMarginAfter(pos);
m_rareData->m_margins.setNegativeMarginAfter(neg);
@@ -2996,7 +2985,7 @@ void RenderBlockFlow::setPaginationStrut(LayoutUnit strut)
if (!m_rareData) {
if (!strut)
return;
- m_rareData = adoptPtrWillBeNoop(new RenderBlockFlowRareData(this));
+ m_rareData = adoptPtr(new RenderBlockFlowRareData(this));
}
m_rareData->m_paginationStrut = strut;
}
@@ -3123,7 +3112,7 @@ RenderBlockFlow::RenderBlockFlowRareData& RenderBlockFlow::ensureRareData()
if (m_rareData)
return *m_rareData;
- m_rareData = adoptPtrWillBeNoop(new RenderBlockFlowRareData(this));
+ m_rareData = adoptPtr(new RenderBlockFlowRareData(this));
return *m_rareData;
}
« no previous file with comments | « Source/core/rendering/RenderBlockFlow.h ('k') | Source/core/rendering/RenderBoxModelObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698