Wrap CSS length conversion arguments in an object

Source/core/animation/AnimatableLength.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * 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
@@ skipping 61 matching lines @@
         return primitiveUnitToNumberType(primitiveValue->primitiveType(), unitType);
     }
     return value->isCalcValue();
 }
 
 PassRefPtr<CSSValue> AnimatableLength::toCSSValue(NumberRange range) const
 {
     return toCSSPrimitiveValue(range);
 }
 
-Length AnimatableLength::toLength(const RenderStyle* style, const RenderStyle* rootStyle, double zoom, NumberRange range) const
+Length AnimatableLength::toLength(const CSSToLengthConversionData& conversionData, NumberRange range) const
 {
     // Avoid creating a CSSValue in the common cases
     if (m_unitType == UnitTypePixels)
-        return Length(clampedNumber(range) * zoom, Fixed);
+        return Length(clampedNumber(range) * conversionData.zoom(), Fixed);
     if (m_unitType == UnitTypePercentage)
         return Length(clampedNumber(range), Percent);
 
-    return toCSSPrimitiveValue(range)->convertToLength<AnyConversion>(style, rootStyle, zoom);
+    return toCSSPrimitiveValue(range)->convertToLength<AnyConversion>(conversionData);
 }
 
 PassRefPtr<AnimatableValue> AnimatableLength::interpolateTo(const AnimatableValue* value, double fraction) const
 {
     const AnimatableLength* length = toAnimatableLength(value);
     NumberUnitType type = commonUnitType(length);
     if (type != UnitTypeCalc)
         return AnimatableLength::create(blend(m_number, length->m_number, fraction), type);
 
     return AnimatableLength::create(scale(1 - fraction).get(), length->scale(fraction).get());
@@ skipping 127 matching lines @@
     case UnitTypeViewportMax:
         return CSSPrimitiveValue::CSS_VMAX;
     case UnitTypeCalc:
         return CSSPrimitiveValue::CSS_UNKNOWN;
     }
     ASSERT_NOT_REACHED();
     return CSSPrimitiveValue::CSS_UNKNOWN;
 }
 
 } // namespace WebCore