[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 d491a58eea490dda7508fbf8a25957f1c3546162..76e42f65e3743dd747a853082943b54790af5f11 100644
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.h
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.h
@@ -37,6 +37,7 @@ struct ContentAlignmentData;
 struct GridArea;
 struct GridSpan;
 class GridTrack;
+class BaselineGroup;
 
 enum TrackSizeComputationPhase {
   ResolveIntrinsicMinimums,
@@ -47,6 +48,7 @@ enum TrackSizeComputationPhase {
   MaximizeTracks,
 };
 enum GridAxisPosition { GridAxisStart, GridAxisEnd, GridAxisCenter };
+enum GridAxis { GridRowAxis, GridColumnAxis };

[svillar, 2017/01/19 09:41:25]

We already have ForRows, ForColumns. Adding another enum for the same seems
confusing to me.

 
 class LayoutGrid final : public LayoutBlock {
  public:
@@ -318,7 +320,32 @@ class LayoutGrid final : public LayoutBlock {
       LinePositionMode = PositionOnContainingLine) const override;
   int firstLineBoxBaseline() const override;
   int inlineBlockBaseline(LineDirectionMode) const override;
-  bool isInlineBaselineAlignedChild(const LayoutBox* child) const;
+
+  bool isHorizontalGridAxis(GridAxis) const;
+  bool isParallelToBlockAxisForChild(const LayoutBox&, GridAxis) const;
+  bool isDescentBaselineForChild(const LayoutBox&, GridAxis) const;
+  bool isBaselineAlignmentForChild(const LayoutBox&,
+                                   GridAxis = GridColumnAxis) const;
+  const BaselineGroup& getBaselineGroupForChild(const LayoutBox&,
+                                                const GridSizingData&,
+                                                GridAxis) const;
+
+  LayoutUnit marginOverForChild(const LayoutBox&, GridAxis) const;
+  LayoutUnit logicalAscentForChild(const LayoutBox&, GridAxis) const;
+  LayoutUnit ascentForChild(const LayoutBox&, GridAxis) const;
+  LayoutUnit descentForChild(const LayoutBox&,
+                             LayoutUnit ascent,
+                             GridAxis) const;
+
+  void computeBaselineAlignmentContext(GridSizingData&) const;
+  void updateBaselineAlignmentContextIfNeeded(LayoutBox&,
+                                              GridSizingData&,
+                                              GridAxis) const;
+
+  LayoutUnit columnAxisBaselineOffsetForChild(const LayoutBox&,
+                                              const GridSizingData&) const;
+  LayoutUnit rowAxisBaselineOffsetForChild(const LayoutBox&,
+                                           const GridSizingData&) const;
 
 #if ENABLE(ASSERT)
   bool tracksAreWiderThanMinTrackBreadth(GridTrackSizingDirection,