CSS Length calculation with MediaValues

Source/core/css/CSSCalculationValue.cpp

Index: Source/core/css/CSSCalculationValue.cpp
diff --git a/Source/core/css/CSSCalculationValue.cpp b/Source/core/css/CSSCalculationValue.cpp
index 6f6cc957e4740839995384d570f9544754be50c3..9e36aac948a0226268f40b9062cb28d870ce0cde 100644
--- a/Source/core/css/CSSCalculationValue.cpp
+++ b/Source/core/css/CSSCalculationValue.cpp
@@ -169,9 +169,9 @@ double CSSCalcValue::doubleValue() const
     return clampToPermittedRange(m_expression->doubleValue());
 }
 
-double CSSCalcValue::computeLengthPx(const CSSToLengthConversionData& conversionData) const
+double CSSCalcValue::computeLengthPx(const CSSLengthData* lengthData) const
 {
-    return clampToPermittedRange(m_expression->computeLengthPx(conversionData));
+    return clampToPermittedRange(m_expression->computeLengthPx(lengthData));
 }
 
 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(CSSCalcExpressionNode)
@@ -229,11 +229,11 @@ public:
         return 0;
     }
 
-    virtual double computeLengthPx(const CSSToLengthConversionData& conversionData) const OVERRIDE
+    virtual double computeLengthPx(const CSSLengthData* lengthData) const OVERRIDE
     {
         switch (m_category) {
         case CalcLength:
-            return m_value->computeLength<double>(conversionData);
+            return m_value->computeLength<double>(*lengthData);
         case CalcPercent:
         case CalcNumber:
             return m_value->getDoubleValue();
@@ -412,10 +412,10 @@ public:
         return evaluate(m_leftSide->doubleValue(), m_rightSide->doubleValue());
     }
 
-    virtual double computeLengthPx(const CSSToLengthConversionData& conversionData) const OVERRIDE
+    virtual double computeLengthPx(const CSSLengthData* lengthData) const OVERRIDE
     {
-        const double leftValue = m_leftSide->computeLengthPx(conversionData);
-        const double rightValue = m_rightSide->computeLengthPx(conversionData);
+        const double leftValue = m_leftSide->computeLengthPx(lengthData);
+        const double rightValue = m_rightSide->computeLengthPx(lengthData);
         return evaluate(leftValue, rightValue);
     }