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 f85d573f714abb0d3c3ce98af10383f73e790966..2b8a16c784d9e96496214e0343ab94e17425bc52 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.h |
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.h |
@@ -33,7 +33,7 @@ |
namespace blink { |
struct ContentAlignmentData; |
-struct GridCoordinate; |
+struct GridArea; |
struct GridSpan; |
class GridTrack; |
@@ -116,10 +116,10 @@ private: |
void resolveContentBasedTrackSizingFunctions(GridTrackSizingDirection, GridSizingData&); |
void ensureGridSize(size_t maximumRowSize, size_t maximumColumnSize); |
- void insertItemIntoGrid(LayoutBox&, const GridCoordinate&); |
+ void insertItemIntoGrid(LayoutBox&, const GridArea&); |
void placeItemsOnGrid(); |
void populateExplicitGridAndOrderIterator(); |
- PassOwnPtr<GridCoordinate> createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(const LayoutBox&, GridTrackSizingDirection, const GridSpan& specifiedPositions) const; |
+ PassOwnPtr<GridArea> createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(const LayoutBox&, GridTrackSizingDirection, const GridSpan& specifiedPositions) const; |
void placeSpecifiedMajorAxisItemsOnGrid(const Vector<LayoutBox*>&); |
void placeAutoMajorAxisItemsOnGrid(const Vector<LayoutBox*>&); |
void placeAutoMajorAxisItemOnGrid(LayoutBox&, std::pair<size_t, size_t>& autoPlacementCursor); |
@@ -158,7 +158,7 @@ private: |
LayoutUnit columnAxisOffsetForChild(const LayoutBox&) const; |
ContentAlignmentData computeContentPositionAndDistributionOffset(GridTrackSizingDirection, const LayoutUnit& availableFreeSpace, unsigned numberOfGridTracks) const; |
LayoutPoint findChildLogicalPosition(const LayoutBox&, GridSizingData&) const; |
- GridCoordinate cachedGridCoordinate(const LayoutBox&) const; |
+ GridArea cachedGridArea(const LayoutBox&) const; |
GridSpan cachedGridSpan(const LayoutBox&, GridTrackSizingDirection) const; |
LayoutUnit gridAreaBreadthForChild(const LayoutBox& child, GridTrackSizingDirection, const Vector<GridTrack>&) const; |
@@ -206,7 +206,7 @@ private: |
bool m_gridIsDirty; |
Vector<LayoutUnit> m_rowPositions; |
Vector<LayoutUnit> m_columnPositions; |
- HashMap<const LayoutBox*, GridCoordinate> m_gridItemCoordinate; |
+ HashMap<const LayoutBox*, GridArea> m_gridItemArea; |
OrderIterator m_orderIterator; |
Vector<LayoutBox*> m_gridItemsOverflowingGridArea; |
HashMap<const LayoutBox*, size_t> m_gridItemsIndexesMap; |