Index: third_party/WebKit/Source/core/layout/LayoutGrid.h |
diff --git a/third_party/WebKit/Source/core/layout/LayoutGrid.h b/third_party/WebKit/Source/core/layout/LayoutGrid.h |
index 2847078d6ca00f3b8cadac00ce3ff950d1126e8d..626978882cb948bdad1e7b164dd9d6b4a270f5f5 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.h |
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.h |
@@ -161,11 +161,11 @@ private: |
template <TrackSizeComputationPhase> void distributeSpaceToTracks(Vector<GridTrack*>&, Vector<GridTrack*>* growBeyondGrowthLimitsTracks, GridSizingData&, LayoutUnit& availableLogicalSpace) const; |
typedef HashSet<size_t, DefaultHash<size_t>::Hash, WTF::UnsignedWithZeroKeyHashTraits<size_t>> TrackIndexSet; |
- double computeFlexFactorUnitSize(const Vector<GridTrack>&, GridTrackSizingDirection, double flexFactorSum, LayoutUnit& leftOverSpace, const Vector<size_t, 8>& flexibleTracksIndexes, std::unique_ptr<TrackIndexSet> tracksToTreatAsInflexible = nullptr) const; |
- double findFlexFactorUnitSize(const Vector<GridTrack>&, const GridSpan&, GridTrackSizingDirection, LayoutUnit leftOverSpace) const; |
+ double computeFlexFactorUnitSize(const Vector<GridTrack>&, GridTrackSizingDirection, const GridSizingData&, double flexFactorSum, LayoutUnit& leftOverSpace, const Vector<size_t, 8>& flexibleTracksIndexes, std::unique_ptr<TrackIndexSet> tracksToTreatAsInflexible = nullptr) const; |
+ double findFlexFactorUnitSize(const Vector<GridTrack>&, const GridSpan&, GridTrackSizingDirection, const GridSizingData&, LayoutUnit leftOverSpace) const; |
const GridTrackSize& rawGridTrackSize(GridTrackSizingDirection, size_t) const; |
- GridTrackSize gridTrackSize(GridTrackSizingDirection, size_t, SizingOperation = TrackSizing) const; |
+ GridTrackSize gridTrackSize(GridTrackSizingDirection, size_t, const GridSizingData&) const; |
bool updateOverrideContainingBlockContentSizeForChild(LayoutBox&, GridTrackSizingDirection, GridSizingData&) const; |
LayoutUnit logicalHeightForChild(LayoutBox&, GridSizingData&) const; |
@@ -183,7 +183,7 @@ private: |
LayoutUnit gridAreaBreadthForChild(const LayoutBox& child, GridTrackSizingDirection, const GridSizingData&) const; |
LayoutUnit gridAreaBreadthForChildIncludingAlignmentOffsets(const LayoutBox&, GridTrackSizingDirection, const GridSizingData&) const; |
- LayoutUnit assumedRowsSizeForOrthogonalChild(const LayoutBox&, SizingOperation) const; |
+ LayoutUnit assumedRowsSizeForOrthogonalChild(const LayoutBox&, const GridSizingData&) const; |
void applyStretchAlignmentToTracksIfNeeded(GridTrackSizingDirection, GridSizingData&); |
@@ -212,7 +212,7 @@ private: |
LayoutUnit guttersSize(GridTrackSizingDirection, size_t startLine, size_t span, SizingOperation) const; |
size_t gridItemSpan(const LayoutBox&, GridTrackSizingDirection); |
- bool spanningItemCrossesFlexibleSizedTracks(const GridSpan&, GridTrackSizingDirection, SizingOperation) const; |
+ bool spanningItemCrossesFlexibleSizedTracks(const GridSpan&, GridTrackSizingDirection, const GridSizingData&) const; |
size_t gridColumnCount() const; |
size_t gridRowCount() const; |