third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp - Issue 1820773002: getComputedStyle() should return used value for 'line-height'

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

Issue 1820773002: getComputedStyle() should return used value for 'line-height' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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/LayoutTests/svg/css/getComputedStyle-listing-expected.txt ('k') | third_party/WebKit/Source/core/style/ComputedStyle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

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

index 9ec10b7bc0ac7b305243d9a57c8ee468a912d753..4ceff9dfc80ec4c2cf32326bebe41ae6371f7efc 100644

--- a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

+++ b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

@@ -515,11 +515,7 @@ static CSSValueList* valueForContentPositionAndDistributionWithOverflowAlignment

static CSSPrimitiveValue* valueForLineHeight(const ComputedStyle& style)

{

- Length length = style.lineHeight();

- if (length.isNegative())

- return cssValuePool().createIdentifierValue(CSSValueNormal);

- return zoomAdjustedPixelValue(floatValueForLength(length, style.getFontDescription().computedSize()), style);

+ return zoomAdjustedPixelValue(style.floatComputedLineHeight(), style);

}

static CSSValueID identifierForFamily(const AtomicString& family)