Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1217)

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

Issue 1125703002: [CSS Grid Layout] Refactoring of grid's alignment logic (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch rebased. Created 5 years, 6 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 | « no previous file | Source/core/layout/LayoutGrid.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutGrid.h
diff --git a/Source/core/layout/LayoutGrid.h b/Source/core/layout/LayoutGrid.h
index 29b44418cd5131d05e20190c319d5e001494672f..0a50e9c3763348c7ed68f6a273f16c398803aee3 100644
--- a/Source/core/layout/LayoutGrid.h
+++ b/Source/core/layout/LayoutGrid.h
@@ -43,6 +43,7 @@ enum TrackSizeComputationPhase {
ResolveMaxContentMaximums,
MaximizeTracks,
};
+enum GridAxisPosition {GridAxisStart, GridAxisEnd, GridAxisCenter};
class LayoutGrid final : public LayoutBlock {
public:
@@ -141,15 +142,9 @@ private:
LayoutUnit logicalHeightForChild(LayoutBox&, Vector<GridTrack>&);
LayoutUnit minContentForChild(LayoutBox&, GridTrackSizingDirection, Vector<GridTrack>& columnTracks);
LayoutUnit maxContentForChild(LayoutBox&, GridTrackSizingDirection, Vector<GridTrack>& columnTracks);
- LayoutUnit startOfColumnForChild(const LayoutBox& child) const;
- LayoutUnit endOfColumnForChild(const LayoutBox& child) const;
- LayoutUnit columnPositionLeft(const LayoutBox&) const;
- LayoutUnit columnPositionRight(const LayoutBox&) const;
- LayoutUnit centeredColumnPositionForChild(const LayoutBox&) const;
+ GridAxisPosition columnAxisPositionForChild(const LayoutBox&) const;
+ GridAxisPosition rowAxisPositionForChild(const LayoutBox&) const;
LayoutUnit columnPositionForChild(const LayoutBox&) const;
- LayoutUnit startOfRowForChild(const LayoutBox& child) const;
- LayoutUnit endOfRowForChild(const LayoutBox& child) const;
- LayoutUnit centeredRowPositionForChild(const LayoutBox&) const;
LayoutUnit rowPositionForChild(const LayoutBox&) const;
void computeContentPositionAndDistributionRowOffset(LayoutUnit availableFreeSpace, GridSizingData&) const;
void computeContentPositionAndDistributionColumnOffset(LayoutUnit availableFreeSpace, GridSizingData&) const;
« no previous file with comments | « no previous file | Source/core/layout/LayoutGrid.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698