Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(644)

Unified Diff: Source/core/css/ComputedStyleCSSValueMapping.cpp

Issue 1123373002: Revert "Do not correct for zoom for number line-height" (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 7 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 | « LayoutTests/fast/css/line-height-number-zoom-get-computed-style-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/ComputedStyleCSSValueMapping.cpp
diff --git a/Source/core/css/ComputedStyleCSSValueMapping.cpp b/Source/core/css/ComputedStyleCSSValueMapping.cpp
index 608e31ec3d17b03a6eeb5ee7021acdb872887343..afdb14398cc0f3540e8298c56cc37a608bc3e0ad 100644
--- a/Source/core/css/ComputedStyleCSSValueMapping.cpp
+++ b/Source/core/css/ComputedStyleCSSValueMapping.cpp
@@ -479,11 +479,7 @@ static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForLineHeight(const Comput
if (length.isNegative())
return cssValuePool().createIdentifierValue(CSSValueNormal);
- float floatValue = floatValueForLength(length, style.fontDescription().specifiedSize());
- if (length.isPercent())
- return cssValuePool().createValue(floatValue, CSSPrimitiveValue::CSS_PX);
-
- return zoomAdjustedPixelValue(floatValue, style);
+ return zoomAdjustedPixelValue(floatValueForLength(length, style.fontDescription().specifiedSize()), style);
}
static CSSValueID identifierForFamily(const AtomicString& family)
« no previous file with comments | « LayoutTests/fast/css/line-height-number-zoom-get-computed-style-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698