Added support of calc() for SVGLength

third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 161 matching lines @@
     case CalcNumber:
         return UnitType::Number;
     case CalcPercent:
         return UnitType::Percentage;
     case CalcLength:
         return UnitType::Pixels;
     case CalcPercentNumber:
         return UnitType::CalcPercentageWithNumber;
     case CalcPercentLength:
         return UnitType::CalcPercentageWithLength;
+    case CalcLengthNumber:
+        return UnitType::CalcLengthWithNumber;
+    case CalcPercentLengthNumber:
+        return UnitType::CalcPercentageWithLengthAndNumber;
     case CalcTime:
         return UnitType::Milliseconds;
     case CalcOther:
         return UnitType::Unknown;
     }
     return UnitType::Unknown;
 }
 
 static const AtomicString& valueName(CSSValueID valueID)
 {
@@ skipping 446 matching lines @@
         return "vh";
     case UnitType::ViewportMin:
         return "vmin";
     case UnitType::ViewportMax:
         return "vmax";
     case UnitType::Unknown:
     case UnitType::ValueID:
     case UnitType::Calc:
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
+    case UnitType::CalcLengthWithNumber:
+    case UnitType::CalcPercentageWithLengthAndNumber:
         break;
     };
     ASSERT_NOT_REACHED();
     return "";
 }
 
 String CSSPrimitiveValue::customCSSText() const
 {
     if (m_hasCachedCSSText) {
         ASSERT(cssTextCache().contains(this));
@@ skipping 41 matching lines @@
         text = formatNumber(m_value.num, unitTypeToString(type()));
         break;
     case UnitType::ValueID:
         text = valueName(m_value.valueID);
         break;
     case UnitType::Calc:
         text = m_value.calc->customCSSText();
         break;
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
+    case UnitType::CalcLengthWithNumber:
+    case UnitType::CalcPercentageWithLengthAndNumber:
         ASSERT_NOT_REACHED();
         break;
     }
 
     ASSERT(!cssTextCache().contains(this));
     cssTextCache().set(this, text);
     m_hasCachedCSSText = true;
     return text;
 }
 
@@ skipping 35 matching lines @@
     case UnitType::ViewportMax:
     case UnitType::Fraction:
         return m_value.num == other.m_value.num;
     case UnitType::ValueID:
         return m_value.valueID == other.m_value.valueID;
     case UnitType::Calc:
         return m_value.calc && other.m_value.calc && m_value.calc->equals(*other.m_value.calc);
     case UnitType::Chs:
     case UnitType::CalcPercentageWithNumber:
     case UnitType::CalcPercentageWithLength:
+    case UnitType::CalcLengthWithNumber:
+    case UnitType::CalcPercentageWithLengthAndNumber:
     case UnitType::QuirkyEms:
         return false;
     }
     return false;
 }
 
 DEFINE_TRACE_AFTER_DISPATCH(CSSPrimitiveValue)
 {
     switch (type()) {
     case UnitType::Calc:
         visitor->trace(m_value.calc);
         break;
     default:
         break;
     }
     CSSValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink