[css-grid] Implementation of Baseline Self-Alignment

third_party/WebKit/Source/core/layout/LayoutGrid.h

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 8ed9d9f5c6b6b3f152a4c6b438b4514c7caeed0b..628e78c9e335d006f8d1e362587d5a6ec19f1e2a 100644
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.h
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.h
@@ -172,6 +172,13 @@ private:
     bool hasAutoMarginsInRowAxis(const LayoutBox&) const;
     void updateAutoMarginsInColumnAxisIfNeeded(LayoutBox&);
     void updateAutoMarginsInRowAxisIfNeeded(LayoutBox&);
+    LayoutUnit marginBoxAscentFromBaselineForChild(const LayoutBox&) const;
+    void updateBaselineAlignmentContextInRowAxisIfNeeded(LayoutBox*, GridSizingData&) const;
+    void applyBaselineAlignmentIfNeeded(const GridSizingData&);
+
+    int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
+    int firstLineBoxBaseline() const override;
+    int inlineBlockBaseline(LineDirectionMode) const override;
 
 #if ENABLE(ASSERT)
     bool tracksAreWiderThanMinTrackBreadth(GridTrackSizingDirection, const Vector<GridTrack>&);
@@ -199,7 +206,7 @@ private:
     Vector<LayoutUnit> m_rowPositions;
     Vector<LayoutUnit> m_columnPositions;
     HashMap<const LayoutBox*, GridCoordinate> m_gridItemCoordinate;
-    OrderIterator m_orderIterator;
+    mutable OrderIterator m_orderIterator;
     Vector<LayoutBox*> m_gridItemsOverflowingGridArea;
     HashMap<const LayoutBox*, size_t> m_gridItemsIndexesMap;
 };