Index: Source/core/layout/LayoutGrid.h |
diff --git a/Source/core/layout/LayoutGrid.h b/Source/core/layout/LayoutGrid.h |
index 811b12d2d951b692ec834f9975305b422d92c639..98c4e931f7aa012d0b393f2169b528fbc31a4eca 100644 |
--- a/Source/core/layout/LayoutGrid.h |
+++ b/Source/core/layout/LayoutGrid.h |
@@ -60,7 +60,7 @@ public: |
bool gridIsDirty() const { return m_gridIsDirty; } |
- typedef void (GridTrack::* AccumulatorGrowFunction)(LayoutUnit); |
+ typedef void (GridTrack::* AccumulatorSetterFunction)(LayoutUnit); |
private: |
virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectLayoutGrid || LayoutBlock::isOfType(type); } |
virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override; |
@@ -104,7 +104,7 @@ private: |
typedef bool (GridTrackSize::* FilterFunction)() const; |
typedef struct GridItemsSpanGroupRange GridItemsSpanGroupRange; |
void resolveContentBasedTrackSizingFunctionsForNonSpanningItems(GridTrackSizingDirection, const GridCoordinate&, LayoutBox& gridItem, GridTrack&, Vector<GridTrack>& columnTracks); |
- void resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirection, GridSizingData&, const GridItemsSpanGroupRange&, FilterFunction, SizingFunction, AccumulatorGetter, AccumulatorGrowFunction, FilterFunction growAboveMaxBreadthFilterFunction = nullptr); |
+ void resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirection, GridSizingData&, const GridItemsSpanGroupRange&, FilterFunction, SizingFunction, AccumulatorGetter trackGetter, AccumulatorGetter trackGetterIfNotInfinite, AccumulatorSetterFunction, FilterFunction growAboveMaxBreadthFilterFunction = nullptr); |
void distributeSpaceToTracks(Vector<GridTrack*>&, const Vector<GridTrack*>* growBeyondGrowthLimitsTracks, AccumulatorGetter, GridSizingData&, LayoutUnit& availableLogicalSpace); |
double computeNormalizedFractionBreadth(Vector<GridTrack>&, const GridSpan& tracksSpan, GridTrackSizingDirection, LayoutUnit availableLogicalSpace) const; |