Chromium Code Reviews| Index: Source/core/rendering/RenderGrid.cpp |
| diff --git a/Source/core/rendering/RenderGrid.cpp b/Source/core/rendering/RenderGrid.cpp |
| index 6a55e68cb75600676d80e5b4385a0b3ce4e19dd3..f2295bdf7d0b1f7c9b1c6c55824a1ee74a5236dc 100644 |
| --- a/Source/core/rendering/RenderGrid.cpp |
| +++ b/Source/core/rendering/RenderGrid.cpp |
| @@ -248,7 +248,7 @@ public: |
| // Performance optimization: hold onto these Vectors until the end of Layout to avoid repeated malloc / free. |
| Vector<GridTrack*> filteredTracks; |
| - WillBeHeapVector<GridItemWithSpan> itemsSortedByIncreasingSpan; |
| + Vector<GridItemWithSpan> itemsSortedByIncreasingSpan; |
| Vector<GridTrack*> growBeyondGrowthLimitsTracks; |
| }; |
| @@ -669,7 +669,7 @@ class GridItemWithSpan { |
| ALLOW_ONLY_INLINE_ALLOCATION(); |
|
haraken
2015/02/04 05:48:56
You can drop ALLOW_ONLY_INLINE_ALLOCATION().
sof
2015/02/04 08:44:31
Done.
|
| public: |
| GridItemWithSpan(RenderBox& gridItem, const GridCoordinate& coordinate, GridTrackSizingDirection direction) |
| - : m_gridItem(gridItem) |
| + : m_gridItem(&gridItem) |
| , m_coordinate(coordinate) |
| { |
| const GridSpan& span = (direction == ForRows) ? coordinate.rows : coordinate.columns; |
| @@ -684,13 +684,8 @@ public: |
| bool operator<(const GridItemWithSpan other) const { return m_span < other.m_span; } |
| - void trace(Visitor* visitor) |
| - { |
| - visitor->trace(m_gridItem); |
| - } |
| - |
| private: |
| - RawPtrWillBeMember<RenderBox> m_gridItem; |
| + RenderBox* m_gridItem; |
| GridCoordinate m_coordinate; |
| size_t m_span; |
| }; |