third_party/WebKit/Source/core/layout/LayoutGrid.h - Issue 1407633003: [css-grid] Implementation of Baseline Self-Alignment

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1407633003: [css-grid] Implementation of Baseline Self-Alignment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Applied suggested changes. Created 4 years, 1 month 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

« third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp ('K') | « third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutGrid.cpp » ('j') | third_party/WebKit/Source/core/layout/LayoutGrid.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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,