Make SVGLength wrap a CSSPrimitiveValue.

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 42 matching lines @@
 {
     StringToUnitTable table;
     table.set(String("em"), CSSPrimitiveValue::UnitType::Ems);
     table.set(String("ex"), CSSPrimitiveValue::UnitType::Exs);
     table.set(String("px"), CSSPrimitiveValue::UnitType::Pixels);
     table.set(String("cm"), CSSPrimitiveValue::UnitType::Centimeters);
     table.set(String("mm"), CSSPrimitiveValue::UnitType::Millimeters);
     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);
     table.set(String("ms"), CSSPrimitiveValue::UnitType::Milliseconds);
     table.set(String("s"), CSSPrimitiveValue::UnitType::Seconds);
     table.set(String("hz"), CSSPrimitiveValue::UnitType::Hertz);
     table.set(String("khz"), CSSPrimitiveValue::UnitType::Kilohertz);
     table.set(String("dpi"), CSSPrimitiveValue::UnitType::DotsPerInch);
     table.set(String("dpcm"), CSSPrimitiveValue::UnitType::DotsPerCentimeter);
     table.set(String("dppx"), CSSPrimitiveValue::UnitType::DotsPerPixel);
@@ skipping 40 matching lines @@
     case UnitType::Number:
         return CSSPrimitiveValue::UNumber;
     case UnitType::Percentage:
         return CSSPrimitiveValue::UPercent;
     case UnitType::Pixels:
     case UnitType::Centimeters:
     case UnitType::Millimeters:
     case UnitType::Inches:
     case UnitType::Points:
     case UnitType::Picas:
+    case UnitType::UserUnits:
         return CSSPrimitiveValue::ULength;
     case UnitType::Milliseconds:
     case UnitType::Seconds:
         return CSSPrimitiveValue::UTime;
     case UnitType::Degrees:
     case UnitType::Radians:
     case UnitType::Gradians:
     case UnitType::Turns:
         return CSSPrimitiveValue::UAngle;
     case UnitType::Hertz:
@@ skipping 188 matching lines @@
     case UnitType::QuirkyEms:
     case UnitType::Exs:
     case UnitType::Rems:
     case UnitType::Chs:
     case UnitType::Pixels:
     case UnitType::Centimeters:
     case UnitType::Millimeters:
     case UnitType::Inches:
     case UnitType::Points:
     case UnitType::Picas:
+    case UnitType::UserUnits:
     case UnitType::Degrees:
     case UnitType::Radians:
     case UnitType::Gradians:
     case UnitType::Milliseconds:
     case UnitType::Seconds:
     case UnitType::Hertz:
     case UnitType::Kilohertz:
     case UnitType::Turns:
     case UnitType::ViewportWidth:
     case UnitType::ViewportHeight:
@@ skipping 111 matching lines @@
     return CSSPrimitiveValue::accumulateLengthArray(lengthArray, lengthTypeArray, multiplier);
 }
 
 double CSSPrimitiveValue::conversionToCanonicalUnitsScaleFactor(UnitType unitType)
 {
     double factor = 1.0;
     // FIXME: the switch can be replaced by an array of scale factors.
     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:
         break;
     case UnitType::Centimeters:
         factor = cssPixelsPerCentimeter;
         break;
     case UnitType::DotsPerCentimeter:
         factor = 1 / cssPixelsPerCentimeter;
         break;
@@ skipping 31 matching lines @@
 
     return factor;
 }
 
 Length CSSPrimitiveValue::convertToLength(const CSSToLengthConversionData& conversionData) const
 {
     if (isLength())
         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));
 }
 
 double CSSPrimitiveValue::getDoubleValue() const
 {
     return type() != UnitType::Calc ? m_value.num : m_value.calc->doubleValue();
 }
 
 CSSPrimitiveValue::UnitType CSSPrimitiveValue::canonicalUnitTypeForCategory(UnitCategory category)
 {
@@ skipping 115 matching lines @@
 static String formatNumber(double number, const char* characters)
 {
     return formatNumber(number, characters, strlen(characters));
 }
 
 const char* CSSPrimitiveValue::unitTypeToString(UnitType type)
 {
     switch (type) {
     case UnitType::Number:
     case UnitType::Integer:
+    case UnitType::UserUnits:
         return "";
     case UnitType::Percentage:
         return "%";
     case UnitType::Ems:
     case UnitType::QuirkyEms:
         return "em";
     case UnitType::Exs:
         return "ex";
     case UnitType::Rems:
         return "rem";
@@ skipping 78 matching lines @@
     case UnitType::Chs:
     case UnitType::Pixels:
     case UnitType::Centimeters:
     case UnitType::DotsPerPixel:
     case UnitType::DotsPerInch:
     case UnitType::DotsPerCentimeter:
     case UnitType::Millimeters:
     case UnitType::Inches:
     case UnitType::Points:
     case UnitType::Picas:
+    case UnitType::UserUnits:
     case UnitType::Degrees:
     case UnitType::Radians:
     case UnitType::Gradians:
     case UnitType::Milliseconds:
     case UnitType::Seconds:
     case UnitType::Hertz:
     case UnitType::Kilohertz:
     case UnitType::Turns:
     case UnitType::Fraction:
     case UnitType::ViewportWidth:
@@ skipping 36 matching lines @@
     case UnitType::Rems:
     case UnitType::Pixels:
     case UnitType::Centimeters:
     case UnitType::DotsPerPixel:
     case UnitType::DotsPerInch:
     case UnitType::DotsPerCentimeter:
     case UnitType::Millimeters:
     case UnitType::Inches:
     case UnitType::Points:
     case UnitType::Picas:
+    case UnitType::UserUnits:
     case UnitType::Degrees:
     case UnitType::Radians:
     case UnitType::Gradians:
     case UnitType::Milliseconds:
     case UnitType::Seconds:
     case UnitType::Hertz:
     case UnitType::Kilohertz:
     case UnitType::Turns:
     case UnitType::ViewportWidth:
     case UnitType::ViewportHeight:
@@ skipping 22 matching lines @@
         visitor->trace(m_value.calc);
         break;
     default:
         break;
     }
 #endif
     CSSValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink