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 2c72b7c49b474a02305ba2dbfd84b0ebb6ebd504..335e18ba7bc5ad3b2c541f0ef8b5eab0e9b85a42 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.h |
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.h |
@@ -119,6 +119,7 @@ private: |
class GridIterator; |
struct GridSizingData; |
+ enum SizingOperation { TrackSizing, IntrinsicSizeComputation }; |
void computeUsedBreadthOfGridTracks(GridTrackSizingDirection, GridSizingData&, LayoutUnit& baseSizesWithoutMaximization, LayoutUnit& growthLimitsWithoutMaximization); |
LayoutUnit computeUsedBreadthOfMinLength(const GridLength&, LayoutUnit maxBreadth) const; |
LayoutUnit computeUsedBreadthOfMaxLength(const GridLength&, LayoutUnit usedBreadth, LayoutUnit maxBreadth) const; |
@@ -159,7 +160,7 @@ private: |
double findFlexFactorUnitSize(const Vector<GridTrack>&, const GridSpan&, GridTrackSizingDirection, LayoutUnit leftOverSpace) const; |
const GridTrackSize& rawGridTrackSize(GridTrackSizingDirection, size_t) const; |
- GridTrackSize gridTrackSize(GridTrackSizingDirection, size_t) const; |
+ GridTrackSize gridTrackSize(GridTrackSizingDirection, size_t, SizingOperation = TrackSizing) const; |
bool updateOverrideContainingBlockContentSizeForChild(LayoutBox&, GridTrackSizingDirection, GridSizingData&); |
LayoutUnit logicalHeightForChild(LayoutBox&, GridSizingData&); |
@@ -196,13 +197,11 @@ private: |
#endif |
size_t gridItemSpan(const LayoutBox&, GridTrackSizingDirection); |
- bool spanningItemCrossesFlexibleSizedTracks(const GridSpan&, GridTrackSizingDirection) const; |
+ bool spanningItemCrossesFlexibleSizedTracks(const GridSpan&, GridTrackSizingDirection, SizingOperation) const; |
size_t gridColumnCount() const; |
size_t gridRowCount() const; |
- bool hasDefiniteLogicalSize(GridTrackSizingDirection) const; |
- |
bool isOrthogonalChild(const LayoutBox&) const; |
GridTrackSizingDirection flowAwareDirectionForChild(const LayoutBox&, GridTrackSizingDirection) const; |