third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp - Issue 1421533006: Make SVGLength wrap a CSSPrimitiveValue.

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 1421533006: Make SVGLength wrap a CSSPrimitiveValue. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Review comments and tests addressed Created 5 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:

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 171269f4704087fde1e30b4b2bd7421fe71b7abd..dc0dabb5f1a42f3500312fc623c00f2ca78e1a66 100644

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

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

@@ -278,6 +278,7 @@ static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> consumeLength(CSSParserTokenRan

case CSSPrimitiveValue::UnitType::Inches:

case CSSPrimitiveValue::UnitType::Points:

case CSSPrimitiveValue::UnitType::Picas:

+ case CSSPrimitiveValue::UnitType::UserUnits:

case CSSPrimitiveValue::UnitType::ViewportWidth:

case CSSPrimitiveValue::UnitType::ViewportHeight:

case CSSPrimitiveValue::UnitType::ViewportMin:

@@ -294,7 +295,10 @@ static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> consumeLength(CSSParserTokenRan

if (!shouldAcceptUnitlessValues(token.numericValue(), cssParserMode, unitless)

|| (valueRange == ValueRangeNonNegative && token.numericValue() < 0))

return nullptr;

- return cssValuePool().createValue(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitType::Pixels);

+ CSSPrimitiveValue::UnitType unitType = CSSPrimitiveValue::UnitType::Pixels;

+ if (cssParserMode == SVGAttributeMode)

+ unitType = CSSPrimitiveValue::UnitType::UserUnits;

+ return cssValuePool().createValue(range.consumeIncludingWhitespace().numericValue(), unitType);

}

CalcParser calcParser(range, valueRange);

if (calcParser.value() && calcParser.value()->category() == CalcLength)