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 9e4437b0a881ffb1c4afa1023f65ecbeec101fc4..8751ec7a5bd21c392398daab9d7e243325bb8aa5 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.h |
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.h |
@@ -130,6 +130,8 @@ private: |
LayoutUnit computeTrackBasedLogicalHeight(const GridSizingData&) const; |
void computeTrackSizesForDirection(GridTrackSizingDirection, GridSizingData&, LayoutUnit freeSpace); |
+ void repeatTracksSizingIfNeeded(GridSizingData&, LayoutUnit availableSpaceForColumns, LayoutUnit availableSpaceForRows); |
+ |
void layoutGridItems(GridSizingData&); |
void prepareChildForPositionedLayout(LayoutBox&); |
void layoutPositionedObjects(bool relayoutChildren, PositionedLayoutBehavior = DefaultLayout); |
@@ -164,6 +166,7 @@ private: |
LayoutUnit gridAreaBreadthForChild(const LayoutBox& child, GridTrackSizingDirection, const GridSizingData&) const; |
LayoutUnit gridAreaBreadthForChildIncludingAlignmentOffsets(const LayoutBox&, GridTrackSizingDirection, const GridSizingData&) const; |
+ LayoutUnit assumedRowsBreadthForOrthogonalChild(const LayoutBox&) const; |
void applyStretchAlignmentToTracksIfNeeded(GridTrackSizingDirection, GridSizingData&); |
@@ -197,6 +200,7 @@ private: |
} |
bool hasDefiniteLogicalSize(GridTrackSizingDirection) const; |
+ bool gridLengthIsIndefinite(const GridLength&, GridTrackSizingDirection) const; |
bool isOrthogonalChild(const LayoutBox&) const; |
GridTrackSizingDirection flowAwareDirectionForChild(const LayoutBox&, GridTrackSizingDirection) const; |
@@ -216,6 +220,7 @@ private: |
int m_smallestRowStart; |
int m_smallestColumnStart; |
+ bool m_hasAnyOrthogonalChild; |
}; |
DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutGrid, isLayoutGrid()); |