Source/core/rendering/RenderBox.cpp - Issue 134013002: Upgrade align-self and align-items parsing to CSS 3

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/RenderBox.cpp

Issue 134013002: Upgrade align-self and align-items parsing to CSS 3 (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Really fix the tests Created 6 years, 11 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

« Source/core/css/parser/BisonCSSParser-in.cpp ('K') | « Source/core/css/resolver/StyleBuilderCustom.cpp ('k') | Source/core/rendering/RenderFlexibleBox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderBox.cpp

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

index ba4d685f23f43ab7471990d6db56280949055e69..d908b90d364757ea296a37060f7ceb71a198fb2c 100644

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

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

@@ -2431,7 +2431,7 @@ static bool columnFlexItemHasStretchAlignment(const RenderObject* flexitem)

ASSERT(parent->style()->isColumnFlexDirection());

if (flexitem->style()->marginStart().isAuto() || flexitem->style()->marginEnd().isAuto())

return false;

- return flexitem->style()->alignSelf() == AlignStretch || (flexitem->style()->alignSelf() == AlignAuto && parent->style()->alignItems() == AlignStretch);

+ return flexitem->style()->alignSelf() == ItemPositionStretch || (flexitem->style()->alignSelf() == ItemPositionAuto && parent->style()->alignItems() == ItemPositionStretch);

}

static bool isStretchingColumnFlexItem(const RenderObject* flexitem)

« Source/core/css/parser/BisonCSSParser-in.cpp ('K') | « Source/core/css/resolver/StyleBuilderCustom.cpp ('k') | Source/core/rendering/RenderFlexibleBox.h » ('j') | no next file with comments »