CSS Length calculation with MediaValues

Source/core/css/CSSCalculationValue.cpp

 /*
  * Copyright (C) 2011, 2012 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 151 matching lines @@
 double CSSCalcValue::clampToPermittedRange(double value) const
 {
     return m_nonNegative && value < 0 ? 0 : value;
 }
 
 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)
 
 class CSSCalcPrimitiveValue FINAL : public CSSCalcExpressionNode {
     WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
 public:
 
     static PassRefPtrWillBeRawPtr<CSSCalcPrimitiveValue> create(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> value, bool isInteger)
     {
@@ skipping 37 matching lines @@
     }
 
     virtual double doubleValue() const OVERRIDE
     {
         if (hasDoubleValue(primitiveType()))
             return m_value->getDoubleValue();
         ASSERT_NOT_REACHED();
         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();
         case CalcPercentLength:
         case CalcPercentNumber:
         case CalcOther:
             ASSERT_NOT_REACHED();
             break;
         }
         ASSERT_NOT_REACHED();
@@ skipping 158 matching lines @@
         if (!right)
             return nullptr;
         return adoptPtr(new CalcExpressionBinaryOperation(left.release(), right.release(), m_operator));
     }
 
     virtual double doubleValue() const OVERRIDE
     {
         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);
     }
 
     static String buildCSSText(const String& leftExpression, const String& rightExpression, CalcOperator op)
     {
         StringBuilder result;
         result.append('(');
         result.append(leftExpression);
         result.append(' ');
         result.append(static_cast<char>(op));
@@ skipping 329 matching lines @@
     return adoptRefWillBeRefCountedGarbageCollected(new CSSCalcValue(expression, range));
 }
 
 void CSSCalcValue::traceAfterDispatch(Visitor* visitor)
 {
     visitor->trace(m_expression);
     CSSValue::traceAfterDispatch(visitor);
 }
 
 } // namespace WebCore