[CSS Grid Layout] Refactoring of grid's alignment logic

Source/core/layout/LayoutGrid.h

 /*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 19 matching lines @@
 #include "core/layout/OrderIterator.h"
 #include "core/style/GridResolvedPosition.h"
 
 namespace blink {
 
 struct GridCoordinate;
 struct GridSpan;
 class GridTrack;
 class GridItemWithSpan;
 
+enum GridAxisPosition {GridAxisStart, GridAxisEnd, GridAxisCenter};
+
 class LayoutGrid final : public LayoutBlock {
 public:
     LayoutGrid(Element*);
     virtual ~LayoutGrid();
 
     virtual const char* name() const override { return "LayoutGrid"; }
 
     virtual void layoutBlock(bool relayoutChildren) override;
 
     virtual bool canCollapseAnonymousBlockChild() const override { return false; }
@@ skipping 57 matching lines @@
     void resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirection, GridSizingData&, const GridItemsSpanGroupRange&, FilterFunction, SizingFunction, AccumulatorGetter, AccumulatorGrowFunction, FilterFunction growAboveMaxBreadthFilterFunction = nullptr);
     void distributeSpaceToTracks(Vector<GridTrack*>&, const Vector<GridTrack*>* growBeyondGrowthLimitsTracks, AccumulatorGetter, GridSizingData&, LayoutUnit& availableLogicalSpace);
 
     double computeNormalizedFractionBreadth(Vector<GridTrack>&, const GridSpan& tracksSpan, GridTrackSizingDirection, LayoutUnit availableLogicalSpace) const;
 
     GridTrackSize gridTrackSize(GridTrackSizingDirection, size_t) const;
 
     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;
     LayoutPoint findChildLogicalPosition(const LayoutBox&, GridSizingData&) const;
     GridCoordinate cachedGridCoordinate(const LayoutBox&) const;
 
     LayoutUnit gridAreaBreadthForChild(const LayoutBox& child, GridTrackSizingDirection, const Vector<GridTrack>&) const;
 
     virtual void paintChildren(const PaintInfo&, const LayoutPoint&) override;
     bool allowedToStretchLogicalHeightForChild(const LayoutBox& child) const;
@@ skipping 35 matching lines @@
     OrderIterator m_orderIterator;
     Vector<LayoutBox*> m_gridItemsOverflowingGridArea;
     HashMap<const LayoutBox*, size_t> m_gridItemsIndexesMap;
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutGrid, isLayoutGrid());
 
 } // namespace blink
 
 #endif // LayoutGrid_h