Make SVGLength wrap a CSSPrimitiveValue.

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

Index: third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp
diff --git a/third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp b/third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp
index e879977f18d51c1654e19b6172d6588d7d65115a..4585a6eaf70bf7c0615ee739fe6cb503b042a607 100644
--- a/third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp
+++ b/third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp
@@ -60,6 +60,7 @@ StringToUnitTable createStringToUnitTable()
     table.set(String("in"), CSSPrimitiveValue::UnitType::Inches);
     table.set(String("pt"), CSSPrimitiveValue::UnitType::Points);
     table.set(String("pc"), CSSPrimitiveValue::UnitType::Picas);
+    table.set(String(""), CSSPrimitiveValue::UnitType::UserUnits);
     table.set(String("deg"), CSSPrimitiveValue::UnitType::Degrees);
     table.set(String("rad"), CSSPrimitiveValue::UnitType::Radians);
     table.set(String("grad"), CSSPrimitiveValue::UnitType::Gradians);
@@ -120,6 +121,7 @@ CSSPrimitiveValue::UnitCategory CSSPrimitiveValue::unitCategory(UnitType type)
     case UnitType::Inches:
     case UnitType::Points:
     case UnitType::Picas:
+    case UnitType::UserUnits:
         return CSSPrimitiveValue::ULength;
     case UnitType::Milliseconds:
     case UnitType::Seconds:
@@ -328,6 +330,7 @@ void CSSPrimitiveValue::cleanup()
     case UnitType::Inches:
     case UnitType::Points:
     case UnitType::Picas:
+    case UnitType::UserUnits:
     case UnitType::Degrees:
     case UnitType::Radians:
     case UnitType::Gradians:
@@ -459,6 +462,7 @@ double CSSPrimitiveValue::conversionToCanonicalUnitsScaleFactor(UnitType unitTyp
     switch (unitType) {
     // These are "canonical" units in their respective categories.
     case UnitType::Pixels:
+    case UnitType::UserUnits:
     case UnitType::Degrees:
     case UnitType::Milliseconds:
     case UnitType::Hertz:
@@ -510,7 +514,6 @@ Length CSSPrimitiveValue::convertToLength(const CSSToLengthConversionData& conve
         return computeLength<Length>(conversionData);
     if (isPercentage())
         return Length(getDoubleValue(), Percent);
-    ASSERT(isCalculated());

[Timothy Loh, 2015/11/04 00:33:44]

This change probably isn't needed

[Stephen Chennney, 2015/11/04 18:04:47]

Done.

     return Length(cssCalcValue()->toCalcValue(conversionData));
 }
 
@@ -646,6 +649,7 @@ const char* CSSPrimitiveValue::unitTypeToString(UnitType type)
     switch (type) {
     case UnitType::Number:
     case UnitType::Integer:
+    case UnitType::UserUnits:
         return "";
     case UnitType::Percentage:
         return "%";
@@ -744,6 +748,7 @@ String CSSPrimitiveValue::customCSSText() const
     case UnitType::Inches:
     case UnitType::Points:
     case UnitType::Picas:
+    case UnitType::UserUnits:
     case UnitType::Degrees:
     case UnitType::Radians:
     case UnitType::Gradians:
@@ -800,6 +805,7 @@ bool CSSPrimitiveValue::equals(const CSSPrimitiveValue& other) const
     case UnitType::Inches:
     case UnitType::Points:
     case UnitType::Picas:
+    case UnitType::UserUnits:
     case UnitType::Degrees:
     case UnitType::Radians:
     case UnitType::Gradians: