Added support of calc() for SVGLength

third_party/WebKit/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 106 matching lines @@
     case CSSPrimitiveValue::UnitType::DotsPerPixel:
     case CSSPrimitiveValue::UnitType::DotsPerInch:
     case CSSPrimitiveValue::UnitType::DotsPerCentimeter:
     case CSSPrimitiveValue::UnitType::Fraction:
     case CSSPrimitiveValue::UnitType::Integer:
         return true;
     case CSSPrimitiveValue::UnitType::Unknown:
     case CSSPrimitiveValue::UnitType::Calc:
     case CSSPrimitiveValue::UnitType::CalcPercentageWithNumber:
     case CSSPrimitiveValue::UnitType::CalcPercentageWithLength:
+    case CSSPrimitiveValue::UnitType::CalcLengthWithNumber:
+    case CSSPrimitiveValue::UnitType::CalcPercentageWithLengthAndNumber:
     case CSSPrimitiveValue::UnitType::ValueID:
     case CSSPrimitiveValue::UnitType::QuirkyEms:
         return false;
     };
     ASSERT_NOT_REACHED();
     return false;
 }
 
 static String buildCSSText(const String& expression)
 {
@@ skipping 61 matching lines @@
     void accumulatePixelsAndPercent(const CSSToLengthConversionData& conversionData, PixelsAndPercent& value, float multiplier) const override
     {
         switch (m_category) {
         case CalcLength:
             value.pixels += m_value->computeLength<float>(conversionData) * multiplier;
             break;
         case CalcPercent:
             ASSERT(m_value->isPercentage());
             value.percent += m_value->getDoubleValue() * multiplier;
             break;
+        case CalcNumber:

[alancutter (OOO until 2018), 2016/07/06 07:45:46]

This is not true for border-image-width (which doesn't support numbers in calc
currently).
Numbers represent multiples of the computed border-width, see:
https://drafts.csswg.org/css-backgrounds-3/#the-border-image-width

We should add a TODO here to stop treating numbers like pixels unconditionally
in calcs to be able to accomodate border-image-width.

+            value.pixels += m_value->getDoubleValue() * multiplier;
+            break;
         default:
             ASSERT_NOT_REACHED();
         }
     }
 
     double doubleValue() const override
     {
         if (hasDoubleValue(typeWithCalcResolved()))
             return m_value->getDoubleValue();
         ASSERT_NOT_REACHED();
         return 0;
     }
 
     double computeLengthPx(const CSSToLengthConversionData& conversionData) const override
     {
         switch (m_category) {
         case CalcLength:
             return m_value->computeLength<double>(conversionData);
         case CalcNumber:
         case CalcPercent:
             return m_value->getDoubleValue();
         case CalcAngle:
         case CalcFrequency:
         case CalcPercentLength:
         case CalcPercentNumber:
         case CalcTime:
+        case CalcLengthNumber:
+        case CalcPercentLengthNumber:
         case CalcOther:
             ASSERT_NOT_REACHED();
             break;
         }
         ASSERT_NOT_REACHED();
         return 0;
     }
 
     void accumulateLengthArray(CSSLengthArray& lengthArray, double multiplier) const override
     {
@@ skipping 26 matching lines @@
     CSSCalcPrimitiveValue(CSSPrimitiveValue* value, bool isInteger)
         : CSSCalcExpressionNode(unitCategory(value->typeWithCalcResolved()), isInteger)
         , m_value(value)
     {
     }
 
     Member<CSSPrimitiveValue> m_value;
 };
 
 static const CalculationCategory addSubtractResult[CalcOther][CalcOther] = {
-//                        CalcNumber         CalcLength         CalcPercent        CalcPercentNumber  CalcPercentLength  CalcAngle  CalcTime   CalcFrequency
-/* CalcNumber */        { CalcNumber,        CalcOther,         CalcPercentNumber, CalcPercentNumber, CalcOther,         CalcOther, CalcOther, CalcOther     },
-/* CalcLength */        { CalcOther,         CalcLength,        CalcPercentLength, CalcOther,         CalcPercentLength, CalcOther, CalcOther, CalcOther     },
-/* CalcPercent */       { CalcPercentNumber, CalcPercentLength, CalcPercent,       CalcPercentNumber, CalcPercentLength, CalcOther, CalcOther, CalcOther     },
-/* CalcPercentNumber */ { CalcPercentNumber, CalcOther,         CalcPercentNumber, CalcPercentNumber, CalcOther,         CalcOther, CalcOther, CalcOther     },
-/* CalcPercentLength */ { CalcOther,         CalcPercentLength, CalcPercentLength, CalcOther,         CalcPercentLength, CalcOther, CalcOther, CalcOther     },
-/* CalcAngle  */        { CalcOther,         CalcOther,         CalcOther,         CalcOther,         CalcOther,         CalcAngle, CalcOther, CalcOther     },
-/* CalcTime */          { CalcOther,         CalcOther,         CalcOther,         CalcOther,         CalcOther,         CalcOther, CalcTime,  CalcOther     },
-/* CalcFrequency */     { CalcOther,         CalcOther,         CalcOther,         CalcOther,         CalcOther,         CalcOther, CalcOther, CalcFrequency }
+//                              CalcNumber               CalcLength               CalcPercent              CalcPercentNumber        CalcPercentLength        CalcAngle  CalcTime   CalcFrequency  CalcLengthNumber         CalcPercentLengthNumber
+/* CalcNumber */              { CalcNumber,              CalcLengthNumber,        CalcPercentNumber,       CalcPercentNumber,       CalcOther,               CalcOther, CalcOther, CalcOther,     CalcLengthNumber,        CalcPercentLengthNumber },
+/* CalcLength */              { CalcLengthNumber,        CalcLength,              CalcPercentLength,       CalcOther,               CalcPercentLength,       CalcOther, CalcOther, CalcOther,     CalcLengthNumber,        CalcPercentLengthNumber },
+/* CalcPercent */             { CalcPercentNumber,       CalcPercentLength,       CalcPercent,             CalcPercentNumber,       CalcPercentLength,       CalcOther, CalcOther, CalcOther,     CalcPercentLengthNumber, CalcPercentLengthNumber },
+/* CalcPercentNumber */       { CalcPercentNumber,       CalcPercentLengthNumber, CalcPercentNumber,       CalcPercentNumber,       CalcPercentLengthNumber, CalcOther, CalcOther, CalcOther,     CalcOther,               CalcPercentLengthNumber },
+/* CalcPercentLength */       { CalcPercentLengthNumber, CalcPercentLength,       CalcPercentLength,       CalcPercentLengthNumber, CalcPercentLength,       CalcOther, CalcOther, CalcOther,     CalcOther,               CalcPercentLengthNumber },
+/* CalcAngle  */              { CalcOther,               CalcOther,               CalcOther,               CalcOther,               CalcOther,               CalcAngle, CalcOther, CalcOther,     CalcOther,               CalcOther               },
+/* CalcTime */                { CalcOther,               CalcOther,               CalcOther,               CalcOther,               CalcOther,               CalcOther, CalcTime,  CalcOther,     CalcOther,               CalcOther               },
+/* CalcFrequency */           { CalcOther,               CalcOther,               CalcOther,               CalcOther,               CalcOther,               CalcOther, CalcOther, CalcFrequency, CalcOther,               CalcOther               },
+/* CalcLengthNumber */        { CalcLengthNumber,        CalcLengthNumber,        CalcPercentLengthNumber, CalcPercentLengthNumber, CalcPercentLengthNumber, CalcOther, CalcOther, CalcOther,     CalcLengthNumber,        CalcPercentLengthNumber },
+/* CalcPercentLengthNumber */ { CalcPercentLengthNumber, CalcPercentLengthNumber, CalcPercentLengthNumber, CalcPercentLengthNumber, CalcPercentLengthNumber, CalcOther, CalcOther, CalcOther,     CalcPercentLengthNumber, CalcPercentLengthNumber }
 };
 
 static CalculationCategory determineCategory(const CSSCalcExpressionNode& leftSide, const CSSCalcExpressionNode& rightSide, CalcOperator op)
 {
     CalculationCategory leftCategory = leftSide.category();
     CalculationCategory rightCategory = rightSide.category();
 
     if (leftCategory == CalcOther || rightCategory == CalcOther)
         return CalcOther;
 
@@ skipping 213 matching lines @@
             return CSSPrimitiveValue::UnitType::Unknown;
         }
         case CalcAngle:
             return CSSPrimitiveValue::UnitType::Degrees;
         case CalcTime:
             return CSSPrimitiveValue::UnitType::Milliseconds;
         case CalcFrequency:
             return CSSPrimitiveValue::UnitType::Hertz;
         case CalcPercentLength:
         case CalcPercentNumber:
+        case CalcLengthNumber:
+        case CalcPercentLengthNumber:
         case CalcOther:
             return CSSPrimitiveValue::UnitType::Unknown;
         }
         ASSERT_NOT_REACHED();
         return CSSPrimitiveValue::UnitType::Unknown;
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         visitor->trace(m_leftSide);
@@ skipping 202 matching lines @@
 
     return expression ? new CSSCalcValue(expression, range) : nullptr;
 }
 
 CSSCalcValue* CSSCalcValue::create(CSSCalcExpressionNode* expression, ValueRange range)
 {
     return new CSSCalcValue(expression, range);
 }
 
 } // namespace blink