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 cd563271ebf381337a30ff9063af614baaaaaefb..cbe5bcc657f4baa1ca079194516894b7a669bb48 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.h |
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.h |
@@ -272,6 +272,7 @@ class LayoutGrid final : public LayoutBlock { |
void paintChildren(const PaintInfo&, const LayoutPoint&) const override; |
LayoutUnit marginLogicalHeightForChild(const LayoutBox&) const; |
+ LayoutUnit marginLogicalWidthForChild(const LayoutBox&) const; |
LayoutUnit computeMarginLogicalSizeForChild(MarginDirection, |
const LayoutBox&) const; |
LayoutUnit availableAlignmentSpaceForChildBeforeStretching( |
@@ -300,6 +301,14 @@ class LayoutGrid final : public LayoutBlock { |
bool hasAutoMarginsInRowAxis(const LayoutBox&) const; |
void updateAutoMarginsInColumnAxisIfNeeded(LayoutBox&); |
void updateAutoMarginsInRowAxisIfNeeded(LayoutBox&); |
+ LayoutUnit firstLineBoxBaselineForChild(const LayoutBox&) const; |
+ LayoutUnit descentBaselineForChild(const LayoutBox&, LayoutUnit) const; |
+ LayoutUnit updateBaselineAlignmentContextIfNeeded(LayoutBox&, |
+ GridSizingData&) const; |
+ LayoutUnit columnAxisBaselineOffsetForChild(const LayoutBox&, |
+ const GridSizingData&) const; |
+ LayoutUnit rowAxisBaselineOffsetForChild(const LayoutBox&, |
+ const GridSizingData&) const; |
int baselinePosition( |
FontBaseline, |
@@ -308,7 +317,9 @@ 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 isInlineBaselineAlignedChild(const LayoutBox& child) const; |
+ bool isBlockBaselineAlignedChild(const LayoutBox& child) const; |
+ bool isBaselineAlignment(const LayoutBox&) const; |
#if ENABLE(ASSERT) |
bool tracksAreWiderThanMinTrackBreadth(GridTrackSizingDirection, |