Wrap CSS length conversion arguments in an object

Source/core/css/resolver/StyleBuilderCustom.h

 /*
  * 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 41 matching lines @@
     static LengthSize convertRadius(StyleResolverState&, CSSValue*);
     static PassRefPtr<ShadowList> convertShadow(StyleResolverState&, CSSValue*);
     static float convertSpacing(StyleResolverState&, CSSValue*);
     template <CSSValueID IdForNone> static AtomicString convertString(StyleResolverState&, CSSValue*);
     static SVGLength convertSVGLength(StyleResolverState&, CSSValue*);
 };
 
 template <typename T>
 T StyleBuilderConverter::convertComputedLength(StyleResolverState& state, CSSValue* value)
 {
-    float zoom = state.style()->effectiveZoom();
-    return toCSSPrimitiveValue(value)->computeLength<T>(state.style(), state.rootElementStyle(), zoom);
+    return toCSSPrimitiveValue(value)->computeLength<T>(state.cssToLengthConversionData());
 }
 
 template <typename T>
 T StyleBuilderConverter::convertLineWidth(StyleResolverState& state, CSSValue* value)
 {
     CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     CSSValueID valueID = primitiveValue->getValueID();
     if (valueID == CSSValueThin)
         return 1;
     if (valueID == CSSValueMedium)
         return 3;
     if (valueID == CSSValueThick)
         return 5;
     if (primitiveValue->isViewportPercentageLength())
         return intValueForLength(primitiveValue->viewportPercentageLength(), 0, state.document().renderView());
     if (valueID == CSSValueInvalid) {
-        float zoom = state.style()->effectiveZoom();
         // Any original result that was >= 1 should not be allowed to fall below 1.
         // This keeps border lines from vanishing.
-        T result = primitiveValue->computeLength<T>(state.style(), state.rootElementStyle(), zoom);
-        if (zoom < 1.0f && result < 1.0) {
-            T originalLength = primitiveValue->computeLength<T>(state.style(), state.rootElementStyle(), 1.0);
+        T result = primitiveValue->computeLength<T>(state.cssToLengthConversionData());
+        if (state.style()->effectiveZoom() < 1.0f && result < 1.0) {
+            T originalLength = primitiveValue->computeLength<T>(state.cssToLengthConversionData().copyWithAdjustedZoom(1.0));
             if (originalLength >= 1.0)
                 return 1.0;
         }
         return result;
     }
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 template <CSSValueID IdForNone>
 AtomicString StyleBuilderConverter::convertString(StyleResolverState&, CSSValue* value)
 {
     CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     if (primitiveValue->getValueID() == IdForNone)
         return nullAtom;
     return primitiveValue->getStringValue();
 }
 
 } // namespace WebCore
 
 #endif