third_party/WebKit/Source/core/layout/LayoutGrid.h - Issue 1648333002: [css-grid] Rename GridCoordinate to GridArea

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/layout/LayoutGrid.h

Issue 1648333002: [css-grid] Rename GridCoordinate to GridArea (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutGrid.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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;