third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp - Issue 1709963002: [css-align] New CSS Value 'normal' for 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/css/parser/CSSPropertyParser.cpp

Issue 1709963002: [css-align] New CSS Value 'normal' for Self Alignment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Patch rebased. Created 4 years, 9 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

« no previous file with comments | « third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp ('k') | third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp

diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp

index 8fff7333f39042da9fd0b18aee1d0ab9270304e1..df5f3e339c8bebb66f27ecccb80acbcaacfe6976 100644

--- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp

+++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp

@@ -3255,7 +3255,7 @@ static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> consumeSelfPositionKeyword(CSSP

static PassRefPtrWillBeRawPtr<CSSValue> consumeSelfPositionOverflowPosition(CSSParserTokenRange& range)

{

- if (identMatches<CSSValueAuto, CSSValueStretch, CSSValueBaseline, CSSValueLastBaseline>(range.peek().id()))

+ if (identMatches<CSSValueAuto, CSSValueNormal, CSSValueStretch, CSSValueBaseline, CSSValueLastBaseline>(range.peek().id()))

return consumeIdent(range);

RefPtrWillBeRawPtr<CSSPrimitiveValue> overflowPosition = consumeIdent<CSSValueUnsafe, CSSValueSafe>(range);

@@ -3637,9 +3637,14 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseSingleValue(CSSProperty

case CSSPropertyWebkitMaskRepeatX:

case CSSPropertyWebkitMaskRepeatY:

return nullptr;

+ case CSSPropertyAlignItems:

+ ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled());

+ if (identMatches<CSSValueAuto>(m_range.peek().id())) {

Timothy Loh 2016/03/15 00:30:28 Can we just make a separate function for align-ite

+ // align-items property does not allow the 'auto' value.

+ return nullptr;

+ }

case CSSPropertyJustifySelf:

case CSSPropertyAlignSelf:

- case CSSPropertyAlignItems:

ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled());

return consumeSelfPositionOverflowPosition(m_range);

case CSSPropertyJustifyItems: