Use a StyleBuilderConverter function for line-height.

Source/core/css/resolver/StyleBuilderCustom.cpp

Index: Source/core/css/resolver/StyleBuilderCustom.cpp
diff --git a/Source/core/css/resolver/StyleBuilderCustom.cpp b/Source/core/css/resolver/StyleBuilderCustom.cpp
index 2518b97435216667292a166fbc13560aff42c469..03d146e5fde0a57ca966bc3b334e1ad441ab4b87 100644
--- a/Source/core/css/resolver/StyleBuilderCustom.cpp
+++ b/Source/core/css/resolver/StyleBuilderCustom.cpp
@@ -304,34 +304,6 @@ void StyleBuilderFunctions::applyValueCSSPropertyGridTemplateAreas(StyleResolver
     state.style()->setNamedGridAreaColumnCount(gridTemplateAreasValue->columnCount());
 }
 
-void StyleBuilderFunctions::applyValueCSSPropertyLineHeight(StyleResolverState& state, CSSValue* value)
-{
-    CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
-    Length lineHeight;
-
-    if (primitiveValue->getValueID() == CSSValueNormal) {
-        lineHeight = RenderStyle::initialLineHeight();
-    } else if (primitiveValue->isLength()) {
-        float multiplier = state.style()->effectiveZoom();
-        if (LocalFrame* frame = state.document().frame())
-            multiplier *= frame->textZoomFactor();
-        lineHeight = primitiveValue->computeLength<Length>(state.cssToLengthConversionData().copyWithAdjustedZoom(multiplier));
-    } else if (primitiveValue->isPercentage()) {
-        lineHeight = Length((state.style()->computedFontSize() * primitiveValue->getIntValue()) / 100.0, Fixed);
-    } else if (primitiveValue->isNumber()) {
-        lineHeight = Length(primitiveValue->getDoubleValue() * 100.0, Percent);
-    } else if (primitiveValue->isCalculated()) {
-        double multiplier = state.style()->effectiveZoom();
-        if (LocalFrame* frame = state.document().frame())
-            multiplier *= frame->textZoomFactor();
-        Length zoomedLength = Length(primitiveValue->cssCalcValue()->toCalcValue(state.cssToLengthConversionData().copyWithAdjustedZoom(multiplier)));
-        lineHeight = Length(valueForLength(zoomedLength, state.style()->fontSize()), Fixed);

[andersr, 2014/11/21 16:29:15]

Calc resolves against RenderStyle::fontSize, but percentage resolves against
RenderStyle::computedFontSize? Can that be right?

[Timothy Loh, 2014/11/21 17:13:02]

Sounds wrong, but I wouldn't fix it in this patch. Maybe makes sense to merge
the length/percent/calc cases and just call convertLength then valueForLength in
all these cases (in a separate patch).

-    } else {
-        return;
-    }
-    state.style()->setLineHeight(lineHeight);
-}
-
 void StyleBuilderFunctions::applyValueCSSPropertyListStyleImage(StyleResolverState& state, CSSValue* value)
 {
     state.style()->setListStyleImage(state.styleImage(CSSPropertyListStyleImage, value));