Index: Source/core/layout/LayoutGrid.h |
diff --git a/Source/core/layout/LayoutGrid.h b/Source/core/layout/LayoutGrid.h |
index 811b12d2d951b692ec834f9975305b422d92c639..98148f8b8db3fa8be79eac1407a753af4c36fd67 100644 |
--- a/Source/core/layout/LayoutGrid.h |
+++ b/Source/core/layout/LayoutGrid.h |
@@ -124,9 +124,9 @@ private: |
LayoutUnit endOfRowForChild(const LayoutBox& child) const; |
LayoutUnit centeredRowPositionForChild(const LayoutBox&) const; |
LayoutUnit rowPositionForChild(const LayoutBox&) const; |
- LayoutUnit contentPositionAndDistributionColumnOffset(LayoutUnit availableFreeSpace, ContentPosition, ContentDistributionType, OverflowAlignment, unsigned numberOfItems) const; |
- LayoutUnit contentPositionAndDistributionRowOffset(LayoutUnit availableFreeSpace, ContentPosition, ContentDistributionType, OverflowAlignment, unsigned numberOfItems) const; |
- LayoutPoint findChildLogicalPosition(const LayoutBox&, LayoutSize contentAlignmentOffset) const; |
+ void computeContentPositionAndDistributionRowOffset(LayoutUnit availableFreeSpace, unsigned numberOfGridTracks); |
+ void computeContentPositionAndDistributionColumnOffset(LayoutUnit availableFreeSpace, unsigned numberOfGridTracks); |
+ LayoutPoint findChildLogicalPosition(const LayoutBox&) const; |
GridCoordinate cachedGridCoordinate(const LayoutBox&) const; |
LayoutUnit gridAreaBreadthForChild(const LayoutBox& child, GridTrackSizingDirection, const Vector<GridTrack>&) const; |
@@ -167,6 +167,10 @@ private: |
bool m_gridIsDirty; |
Vector<LayoutUnit> m_rowPositions; |
Vector<LayoutUnit> m_columnPositions; |
+ LayoutUnit m_rowsPositionOffset; |
+ LayoutUnit m_rowsDistributionOffset; |
+ LayoutUnit m_columnsPositionOffset; |
+ LayoutUnit m_columnsDistributionOffset; |
Julien - ping for review
2015/04/15 14:14:00
Why do we need those members? They seem like trans
jfernandez
2015/04/16 17:03:38
I've finally moved the fields into the GridSizingD
|
HashMap<const LayoutBox*, GridCoordinate> m_gridItemCoordinate; |
OrderIterator m_orderIterator; |
Vector<LayoutBox*> m_gridItemsOverflowingGridArea; |