Oilpan: move RenderObjects off heap.

Source/core/layout/LayoutTableSection.h

 /*
  * Copyright (C) 1997 Martin Jones (mjones@kde.org)
  *           (C) 1997 Torben Weis (weis@kde.org)
  *           (C) 1998 Waldo Bastian (bastian@kde.org)
  *           (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2009, 2013 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 49 matching lines @@
     unsigned m_end;
 };
 
 class LayoutTableCell;
 class LayoutTableRow;
 
 class LayoutTableSection final : public RenderBox {
 public:
     LayoutTableSection(Element*);
     virtual ~LayoutTableSection();
-    virtual void trace(Visitor*) override;
 
     LayoutTableRow* firstRow() const;
     LayoutTableRow* lastRow() const;
 
     const RenderObjectChildList* children() const { return &m_children; }
     RenderObjectChildList* children() { return &m_children; }
 
     virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override;
 
     virtual int firstLineBoxBaseline() const override;
 
     void addCell(LayoutTableCell*, LayoutTableRow*);
 
     int calcRowLogicalHeight();
     void layoutRows();
     void computeOverflowFromCells();
 
     LayoutTable* table() const { return toLayoutTable(parent()); }
 
-    typedef WillBeHeapVector<RawPtrWillBeMember<LayoutTableCell>, 2> SpanningLayoutTableCells;
+    typedef Vector<LayoutTableCell*, 2> SpanningLayoutTableCells;
 
     struct CellStruct {
         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, but does it add value to do so?

     public:
-        WillBeHeapVector<RawPtrWillBeMember<LayoutTableCell>, 1> cells;
+        Vector<LayoutTableCell*, 1> cells;
         bool inColSpan; // true for columns after the first in a colspan
 
         CellStruct()
             : inColSpan(false)
         {
         }
-        void trace(Visitor*);
 
         LayoutTableCell* primaryCell()
         {
-            return hasCells() ? cells[cells.size() - 1].get() : 0;
+            return hasCells() ? cells[cells.size() - 1] : 0;
         }
 
         const LayoutTableCell* primaryCell() const
         {
-            return hasCells() ? cells[cells.size() - 1].get() : 0;
+            return hasCells() ? cells[cells.size() - 1] : 0;
         }
 
         bool hasCells() const { return cells.size() > 0; }
     };
 
-    typedef WillBeHeapVector<CellStruct> Row;
+    typedef Vector<CellStruct> Row;
 
     struct RowStruct {
         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:
         RowStruct()
             : rowRenderer(nullptr)
             , baseline()
         {
         }
-        void trace(Visitor*);
 
         Row row;
-        RawPtrWillBeMember<LayoutTableRow> rowRenderer;
+        LayoutTableRow* rowRenderer;
         LayoutUnit baseline;
         Length logicalHeight;
     };
 
     struct SpanningRowsHeight {
         WTF_MAKE_NONCOPYABLE(SpanningRowsHeight);
 
     public:
         SpanningRowsHeight()
             : totalRowsHeight(0)
@@ skipping 84 matching lines @@
         return createAnonymousWithParentRenderer(parent);
     }
 
     virtual void paint(const PaintInfo&, const LayoutPoint&) override;
 
     // Flip the rect so it aligns with the coordinates used by the rowPos and columnPos vectors.
     LayoutRect logicalRectForWritingModeAndDirection(const LayoutRect&) const;
 
     CellSpan dirtiedRows(const LayoutRect& paintInvalidationRect) const;
     CellSpan dirtiedColumns(const LayoutRect& paintInvalidationRect) const;
-    WillBeHeapHashSet<RawPtrWillBeMember<LayoutTableCell> >& overflowingCells() { return m_overflowingCells; }
+    HashSet<LayoutTableCell*>& overflowingCells() { return m_overflowingCells; }
     bool hasMultipleCellLevels() { return m_hasMultipleCellLevels; }
 
 protected:
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override;
 
 private:
     virtual RenderObjectChildList* virtualChildren() override { return children(); }
     virtual const RenderObjectChildList* virtualChildren() const override { return children(); }
 
@@ skipping 39 matching lines @@
 
     // These two functions take a rectangle as input that has been flipped by logicalRectForWritingModeAndDirection.
     // The returned span of rows or columns is end-exclusive, and empty if start==end.
     CellSpan spannedRows(const LayoutRect& flippedRect) const;
     CellSpan spannedColumns(const LayoutRect& flippedRect) const;
 
     void setLogicalPositionForCell(LayoutTableCell*, unsigned effectiveColumn) const;
 
     RenderObjectChildList m_children;
 
-    WillBeHeapVector<RowStruct> m_grid;
+    Vector<RowStruct> m_grid;
     Vector<int> m_rowPos;
 
     // the current insertion position
     unsigned m_cCol;
     unsigned m_cRow;
 
     int m_outerBorderStart;
     int m_outerBorderEnd;
     int m_outerBorderBefore;
     int m_outerBorderAfter;
 
     bool m_needsCellRecalc;
 
     // This HashSet holds the overflowing cells for faster painting.
     // If we have more than gMaxAllowedOverflowingCellRatio * total cells, it will be empty
     // and m_forceSlowPaintPathWithOverflowingCell will be set to save memory.
-    WillBeHeapHashSet<RawPtrWillBeMember<LayoutTableCell> > m_overflowingCells;
+    HashSet<LayoutTableCell*> m_overflowingCells;
     bool m_forceSlowPaintPathWithOverflowingCell;
 
     bool m_hasMultipleCellLevels;
 
     // This map holds the collapsed border values for cells with collapsed borders.
     // It is held at LayoutTableSection level to spare memory consumption by table cells.
-    WillBeHeapHashMap<pair<RawPtrWillBeMember<const LayoutTableCell>, int>, CollapsedBorderValue > m_cellsCollapsedBorders;
+    HashMap<pair<const LayoutTableCell*, int>, CollapsedBorderValue> m_cellsCollapsedBorders;
 };
 
 DEFINE_RENDER_OBJECT_TYPE_CASTS(LayoutTableSection, isTableSection());
 
 } // namespace blink
 
 #if ENABLE(OILPAN)

[tkent, 2015/02/04 00:50:44]

We can remove this block.

[sof, 2015/02/04 08:44:31]

Thanks, removed.

 namespace WTF {
 
 template<> struct VectorTraits<blink::LayoutTableSection::CellStruct> : VectorTraitsBase<blink::LayoutTableSection::CellStruct> {
     static const bool needsDestruction = false;
 };
 
 template<> struct VectorTraits<blink::LayoutTableSection::RowStruct> : VectorTraitsBase<blink::LayoutTableSection::RowStruct> {
     static const bool needsDestruction = false;
 };
 
 } // namespace WTF
 #endif
 
 #endif // LayoutTableSection_h