Oilpan: fix build after r183657.

Source/core/rendering/RenderGrid.cpp

 /*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 15 matching lines @@
 #include "config.h"
 #include "core/rendering/RenderGrid.h"
 
 #include "core/paint/GridPainter.h"
 #include "core/rendering/RenderLayer.h"
 #include "core/rendering/RenderView.h"
 #include "core/rendering/TextAutosizer.h"
 #include "core/rendering/style/GridCoordinate.h"
 #include "core/rendering/style/RenderStyle.h"
 #include "platform/LengthFunctions.h"
+#include "wtf/VectorTraits.h"
 
 namespace blink {
 
 static const int infinity = -1;
 
 class GridTrack {
 public:
     GridTrack()
         : m_usedBreadth(0)
         , m_maxBreadth(0)
@@ skipping 119 matching lines @@
 private:
     const GridRepresentation& m_grid;
     GridTrackSizingDirection m_direction;
     size_t m_rowIndex;
     size_t m_columnIndex;
     size_t m_childIndex;
 };
 
 struct RenderGrid::GridSizingData {
     WTF_MAKE_NONCOPYABLE(GridSizingData);
+    STACK_ALLOCATED();
 public:
     GridSizingData(size_t gridColumnCount, size_t gridRowCount)
         : columnTracks(gridColumnCount)
         , rowTracks(gridRowCount)
     {
     }
 
     Vector<GridTrack> columnTracks;
     Vector<GridTrack> rowTracks;
     Vector<size_t> contentSizedTracksIndex;
 
     // Performance optimization: hold onto these Vectors until the end of Layout to avoid repeated malloc / free.
     Vector<LayoutUnit> distributeTrackVector;
     Vector<GridTrack*> filteredTracks;
-    Vector<GridItemWithSpan> itemsSortedByIncreasingSpan;
+    WillBeHeapVector<GridItemWithSpan> itemsSortedByIncreasingSpan;
 };
 
 RenderGrid::RenderGrid(Element* element)
     : RenderBlock(element)
     , m_gridIsDirty(true)
     , m_orderIterator(this)
 {
     ASSERT(!childrenInline());
 }
 
@@ skipping 461 matching lines @@
 
     return logicalHeightForChild(child, columnTracks);
 }
 
 // We're basically using a class instead of a std::pair for two reasons. First of all, accessing gridItem() or
 // coordinate() is much more self-explanatory that using .first or .second members in the pair. Secondly the class
 // allows us to precompute the value of the span, something which is quite convenient for the sorting. Having a
 // std::pair<RenderBox*, size_t> does not work either because we still need the GridCoordinate so we'd have to add an
 // extra hash lookup for each item at the beginning of RenderGrid::resolveContentBasedTrackSizingFunctionsForItems().
 class GridItemWithSpan {
+    ALLOW_ONLY_INLINE_ALLOCATION();
 public:
     GridItemWithSpan(RenderBox& gridItem, const GridCoordinate& coordinate, GridTrackSizingDirection direction)
         : m_gridItem(gridItem)
         , m_coordinate(coordinate)
     {
         const GridSpan& span = (direction == ForRows) ? coordinate.rows : coordinate.columns;
         m_span = span.resolvedFinalPosition.toInt() - span.resolvedInitialPosition.toInt() + 1;
     }
 
     RenderBox& gridItem() const { return *m_gridItem; }
     GridCoordinate coordinate() const { return m_coordinate; }
 
     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;
     GridCoordinate m_coordinate;
     size_t m_span;
 };
 
+} // namespace blink
+
+namespace WTF  {
+
+template<>
+struct VectorTraits<blink::GridItemWithSpan> : SimpleClassVectorTraits<blink::GridItemWithSpan> {
+    // needsDestruction is by default defined in terms of IsPod<>, but as
+    // it doesn't handle embedded structs/enums (e.g., GridCoordinate),
+    // override it here.
+    static const bool needsDestruction = false;
+};

[haraken, 2014/10/14 11:41:30]

Can't we use WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS instead?

[sof, 2014/10/14 11:47:21]

Same as for GradientStop, the reason why not is that we have to override/fix
needsDestruction for this type.

I think we should consider introducing a macro for that, though. Can do that in
a followup, if so.

+
+} // namespace WTF
+
+namespace blink {
+
 void RenderGrid::resolveContentBasedTrackSizingFunctions(GridTrackSizingDirection direction, GridSizingData& sizingData, LayoutUnit& availableLogicalSpace)
 {
     sizingData.itemsSortedByIncreasingSpan.shrink(0);
     HashSet<RenderBox*> itemsSet;
     size_t contentSizedTracksCount = sizingData.contentSizedTracksIndex.size();
     for (size_t i = 0; i < contentSizedTracksCount; ++i) {
         GridIterator iterator(m_grid, direction, sizingData.contentSizedTracksIndex[i]);
         while (RenderBox* gridItem = iterator.nextGridItem()) {
             if (itemsSet.add(gridItem).isNewEntry)
                 sizingData.itemsSortedByIncreasingSpan.append(GridItemWithSpan(*gridItem, cachedGridCoordinate(*gridItem), direction));
@@ skipping 693 matching lines @@
     if (isOutOfFlowPositioned())
         return "RenderGrid (positioned)";
     if (isAnonymous())
         return "RenderGrid (generated)";
     if (isRelPositioned())
         return "RenderGrid (relative positioned)";
     return "RenderGrid";
 }
 
 } // namespace blink