third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.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/resolver/StyleBuilderConverter.cpp

Issue 1421533006: Make SVGLength wrap a CSSPrimitiveValue. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed the initial types on properties 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:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp ('K') | « third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp ('k') | third_party/WebKit/Source/core/svg/SVGAnimatedLength.cpp » ('j') | third_party/WebKit/Source/core/svg/SVGLength.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

diff --git a/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp b/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

index ccdd3374aba7b1ae0b9696b3c7c79996c6a266c6..a9c349be636a5993f85fcd74f2f71530d4c2dd19 100644

--- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

+++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

@@ -210,6 +210,8 @@ static float computeFontSize(StyleResolverState& state, const CSSPrimitiveValue&

return primitiveValue.computeLength<float>(conversionData);

if (primitiveValue.isCalculatedPercentageWithLength())

return primitiveValue.cssCalcValue()->toCalcValue(conversionData)->evaluate(parentSize.value);

+ if (primitiveValue.isNumber())

Timothy Loh 2015/11/04 00:33:44 Don't think this is needed, probably left in from

Stephen Chennney 2015/11/04 18:04:47 Done.

+ return primitiveValue.getFloatValue();

ASSERT_NOT_REACHED();

return 0;