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 c8de593d3335a6b9365e4df5ae3525468e4b4aed..ce0f8f2e3baf66a61b1a683870914c743feba653 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.h |
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.h |
@@ -146,7 +146,8 @@ private: |
LayoutUnit computeTrackBasedLogicalHeight(const GridSizingData&) const; |
void computeTrackSizesForDirection(GridTrackSizingDirection, GridSizingData&, LayoutUnit freeSpace); |
- void repeatTracksSizingIfNeeded(GridSizingData&, LayoutUnit availableSpaceForColumns, LayoutUnit availableSpaceForRows); |
+ void resolveSizeOfGridRows(GridSizingData&); |
+ void repeatTracksSizingIfNeeded(GridSizingData&); |
void layoutGridItems(GridSizingData&); |
void prepareChildForPositionedLayout(LayoutBox&); |
@@ -241,7 +242,7 @@ private: |
size_t m_autoRepeatColumns { 0 }; |
size_t m_autoRepeatRows { 0 }; |
- bool m_hasAnyOrthogonalChild; |
+ Vector<LayoutBox*> m_orthogonalChilds; |
mstensho (USE GERRIT)
2016/09/20 21:30:29
childs -> children
|
std::unique_ptr<OrderedTrackIndexSet> m_autoRepeatEmptyColumns { nullptr }; |
std::unique_ptr<OrderedTrackIndexSet> m_autoRepeatEmptyRows { nullptr }; |