Use a StyleBuilderConverter function for line-height.

Source/core/css/resolver/StyleBuilderConverter.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
  *     * Neither the name of Google Inc. nor the names of its
@@ skipping 554 matching lines @@
 LineBoxContain StyleBuilderConverter::convertLineBoxContain(StyleResolverState&, CSSValue* value)
 {
     if (value->isPrimitiveValue()) {
         ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueNone);
         return LineBoxContainNone;
     }
 
     return toCSSLineBoxContainValue(value)->value();
 }
 
+static CSSToLengthConversionData lineHeightToLengthConversionData(StyleResolverState& state)
+{
+    float multiplier = state.style()->effectiveZoom();
+    if (LocalFrame* frame = state.document().frame())
+        multiplier *= frame->textZoomFactor();
+    return state.cssToLengthConversionData().copyWithAdjustedZoom(multiplier);
+}
+
+Length StyleBuilderConverter::convertLineHeight(StyleResolverState& state, CSSValue* value)
+{
+    CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
+
+    if (primitiveValue->isLength())
+        return primitiveValue->computeLength<Length>(lineHeightToLengthConversionData(state));
+    if (primitiveValue->isPercentage())
+        return Length((state.style()->computedFontSize() * primitiveValue->getIntValue()) / 100.0, Fixed);
+    if (primitiveValue->isNumber())
+        return Length(primitiveValue->getDoubleValue() * 100.0, Percent);
+    if (primitiveValue->isCalculated()) {
+        Length zoomedLength = Length(primitiveValue->cssCalcValue()->toCalcValue(lineHeightToLengthConversionData(state)));
+        return Length(valueForLength(zoomedLength, state.style()->fontSize()), Fixed);
+    }
+
+    ASSERT(primitiveValue->getValueID() == CSSValueNormal);
+    return RenderStyle::initialLineHeight();
+}
+
 float StyleBuilderConverter::convertNumberOrPercentage(StyleResolverState& state, CSSValue* value)
 {
     CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     ASSERT(primitiveValue->isNumber() || primitiveValue->isPercentage());
     if (primitiveValue->isNumber())
         return primitiveValue->getFloatValue();
     return primitiveValue->getFloatValue() / 100.0f;
 }
 
 static float convertPerspectiveLength(StyleResolverState& state, CSSPrimitiveValue* primitiveValue)
@@ skipping 238 matching lines @@
     CSSPrimitiveValue* primitiveValueZ = toCSSPrimitiveValue(list->item(2));
 
     return TransformOrigin(
         convertOriginLength<CSSValueLeft, CSSValueRight>(state, primitiveValueX),
         convertOriginLength<CSSValueTop, CSSValueBottom>(state, primitiveValueY),
         StyleBuilderConverter::convertComputedLength<float>(state, primitiveValueZ)
     );
 }
 
 } // namespace blink