| Index: Source/core/rendering/RenderGrid.h
|
| diff --git a/Source/core/rendering/RenderGrid.h b/Source/core/rendering/RenderGrid.h
|
| index 6f17556a22776a0014c78a93314c230b05a58a03..64283c18404d4137a6ba8f41399ac21b69f52ffb 100644
|
| --- a/Source/core/rendering/RenderGrid.h
|
| +++ b/Source/core/rendering/RenderGrid.h
|
| @@ -35,6 +35,7 @@ namespace blink {
|
| struct GridCoordinate;
|
| struct GridSpan;
|
| class GridTrack;
|
| +class GridItemWithSpan;
|
|
|
| class RenderGrid FINAL : public RenderBlock {
|
| public:
|
| @@ -101,7 +102,7 @@ private:
|
| typedef LayoutUnit (GridTrack::* AccumulatorGetter)() const;
|
| typedef void (GridTrack::* AccumulatorGrowFunction)(LayoutUnit);
|
| typedef bool (GridTrackSize::* FilterFunction)() const;
|
| - void resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirection, GridSizingData&, RenderBox&, FilterFunction, SizingFunction, AccumulatorGetter, AccumulatorGrowFunction);
|
| + void resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirection, GridSizingData&, GridItemWithSpan&, FilterFunction, SizingFunction, AccumulatorGetter, AccumulatorGrowFunction);
|
| void distributeSpaceToTracks(Vector<GridTrack*>&, Vector<GridTrack*>* tracksForGrowthAboveMaxBreadth, AccumulatorGetter, AccumulatorGrowFunction, GridSizingData&, LayoutUnit& availableLogicalSpace);
|
|
|
| double computeNormalizedFractionBreadth(Vector<GridTrack>&, const GridSpan& tracksSpan, GridTrackSizingDirection, LayoutUnit availableLogicalSpace) const;
|
|
|