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

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

Issue 423093002: Oilpan: Prepare to move RenderObject and RenderObjectChildList to Oilpan heap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: dispose -> destroy Created 6 years, 4 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/RenderTableSection.h ('k') | Source/core/rendering/RenderTextFragment.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderTableSection.cpp
diff --git a/Source/core/rendering/RenderTableSection.cpp b/Source/core/rendering/RenderTableSection.cpp
index 60ad60b407346efcd55964c660e96dc67e93985f..9504b4c4817b3a21fbd813fb02db63002a579705 100644
--- a/Source/core/rendering/RenderTableSection.cpp
+++ b/Source/core/rendering/RenderTableSection.cpp
@@ -77,6 +77,18 @@ static inline void updateLogicalHeightForCell(RenderTableSection::RowStruct& row
}
}
+void RenderTableSection::CellStruct::trace(Visitor* visitor)
+{
+#if ENABLE(OILPAN)
+ visitor->trace(cells);
+#endif
+}
+
+void RenderTableSection::RowStruct::trace(Visitor* visitor)
+{
+ visitor->trace(row);
+ visitor->trace(rowRenderer);
+}
RenderTableSection::RenderTableSection(Element* element)
: RenderBox(element)
@@ -97,6 +109,17 @@ RenderTableSection::~RenderTableSection()
{
}
+void RenderTableSection::trace(Visitor* visitor)
+{
+#if ENABLE(OILPAN)
+ visitor->trace(m_children);
+ visitor->trace(m_grid);
+ visitor->trace(m_overflowingCells);
+ visitor->trace(m_cellsCollapsedBorders);
+#endif
+ RenderBox::trace(visitor);
+}
+
void RenderTableSection::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
{
RenderBox::styleDidChange(diff, oldStyle);
@@ -1001,7 +1024,7 @@ void RenderTableSection::layoutRows()
for (unsigned rowIndex = r + 1; rowIndex <= totalRows; rowIndex++)
m_rowPos[rowIndex] += rowHeightIncreaseForPagination;
for (unsigned c = 0; c < nEffCols; ++c) {
- Vector<RenderTableCell*, 1>& cells = cellAt(r, c).cells;
+ WillBeHeapVector<RawPtrWillBeMember<RenderTableCell>, 1>& cells = cellAt(r, c).cells;
for (size_t i = 0; i < cells.size(); ++i) {
LayoutUnit oldLogicalHeight = cells[i]->logicalHeight();
cells[i]->setLogicalHeight(oldLogicalHeight + rowHeightIncreaseForPagination);
@@ -1683,7 +1706,7 @@ void RenderTableSection::setCachedCollapsedBorder(const RenderTableCell* cell, C
CollapsedBorderValue& RenderTableSection::cachedCollapsedBorder(const RenderTableCell* cell, CollapsedBorderSide side)
{
ASSERT(table()->collapseBorders());
- HashMap<pair<const RenderTableCell*, int>, CollapsedBorderValue>::iterator it = m_cellsCollapsedBorders.find(std::make_pair(cell, side));
+ WillBeHeapHashMap<pair<RawPtrWillBeMember<const RenderTableCell>, int>, CollapsedBorderValue>::iterator it = m_cellsCollapsedBorders.find(std::make_pair(cell, side));
ASSERT_WITH_SECURITY_IMPLICATION(it != m_cellsCollapsedBorders.end());
return it->value;
}
« no previous file with comments | « Source/core/rendering/RenderTableSection.h ('k') | Source/core/rendering/RenderTextFragment.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698