Source/core/rendering/RenderGrid.cpp - Issue 363133003: [CSS Grid Layout] Adapting align-self, align-items and justify-self to the last CSS 3 spec.

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: Source/core/rendering/RenderGrid.cpp

Issue 363133003: [CSS Grid Layout] Adapting align-self, align-items and justify-self to the last CSS 3 spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Resolve grid and flex cases during cascade, the rest will wait for layout. Created 6 years, 5 months 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

« LayoutTests/fast/alignment/parse-align-items.html ('K') | « Source/core/rendering/RenderFlexibleBox.cpp ('k') | Source/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderGrid.cpp

diff --git a/Source/core/rendering/RenderGrid.cpp b/Source/core/rendering/RenderGrid.cpp

index 9b4bb0a8b6a2702e64513e27995fc97473319ac8..64252e791b71cce18711b93339b4091fd27f04a7 100644

--- a/Source/core/rendering/RenderGrid.cpp

+++ b/Source/core/rendering/RenderGrid.cpp

@@ -1219,7 +1219,7 @@ LayoutUnit RenderGrid::centeredRowPositionForChild(const RenderBox* child) const

static ItemPosition resolveAlignment(const RenderStyle* parentStyle, const RenderStyle* childStyle)

{

ItemPosition align = childStyle->alignSelf();

- // The auto keyword computes to the computed value of align-items on the parent.

+ // The auto keyword computes to the parent's align-items computed value, or to "stretch", if not set or "auto".

if (align == ItemPositionAuto)

align = (parentStyle->alignItems() == ItemPositionAuto) ? ItemPositionStretch : parentStyle->alignItems();

return align;

« LayoutTests/fast/alignment/parse-align-items.html ('K') | « Source/core/rendering/RenderFlexibleBox.cpp ('k') | Source/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »