Make SVGLength wrap a CSSPrimitiveValue.

third_party/WebKit/Source/core/svg/SVGLengthContext.cpp

 /*
  * Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. 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.
@@ skipping 165 matching lines @@
 float SVGLengthContext::valueForLength(const Length& length, float zoom, float dimension)
 {
     ASSERT(zoom != 0);
     // isIntrinsic can occur for 'width' and 'height', but has no
     // real meaning for svg.
     if (length.isIntrinsic())
         return 0;
     return floatValueForLength(length, dimension * zoom) / zoom;
 }
 
-float SVGLengthContext::convertValueToUserUnits(float value, SVGLengthMode mode, SVGLengthType fromUnit) const
+float SVGLengthContext::convertValueToUserUnits(float value, SVGLengthMode mode, CSSPrimitiveValue::UnitType fromUnit) const
 {
     float userUnits = value;
     switch (fromUnit) {
-    case LengthTypeUnknown:
+    case CSSPrimitiveValue::UnitType::Unknown:

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

this might be an ASSERT_NOT_REACHED case (i.e. let default catch it)

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

Done.

         return 0;
-    case LengthTypePX:
-    case LengthTypeNumber:
+    case CSSPrimitiveValue::UnitType::Pixels:
+    case CSSPrimitiveValue::UnitType::Number:
+    case CSSPrimitiveValue::UnitType::UserUnits:
         userUnits = value;
         break;
-    case LengthTypePercentage: {
+    case CSSPrimitiveValue::UnitType::Percentage: {
         FloatSize viewportSize;
         if (!determineViewport(viewportSize))
             return 0;
         userUnits = value * dimensionForLengthMode(mode, viewportSize) / 100;
         break;
     }
-    case LengthTypeEMS:
+    case CSSPrimitiveValue::UnitType::Ems:
         userUnits = convertValueFromEMSToUserUnits(computedStyleForLengthResolving(m_context), value);
         break;
-    case LengthTypeEXS:
+    case CSSPrimitiveValue::UnitType::Exs:
         userUnits = convertValueFromEXSToUserUnits(value);
         break;
-    case LengthTypeCM:
+    case CSSPrimitiveValue::UnitType::Centimeters:
         userUnits = value * cssPixelsPerCentimeter;
         break;
-    case LengthTypeMM:
+    case CSSPrimitiveValue::UnitType::Millimeters:
         userUnits = value * cssPixelsPerMillimeter;
         break;
-    case LengthTypeIN:
+    case CSSPrimitiveValue::UnitType::Inches:
         userUnits = value * cssPixelsPerInch;
         break;
-    case LengthTypePT:
+    case CSSPrimitiveValue::UnitType::Points:
         userUnits = value * cssPixelsPerPoint;
         break;
-    case LengthTypePC:
+    case CSSPrimitiveValue::UnitType::Picas:
         userUnits = value * cssPixelsPerPica;
         break;
-    case LengthTypeREMS:
+    case CSSPrimitiveValue::UnitType::Rems:
         userUnits = convertValueFromEMSToUserUnits(rootElementStyle(m_context), value);
         break;
-    case LengthTypeCHS:
+    case CSSPrimitiveValue::UnitType::Chs:
         userUnits = convertValueFromCHSToUserUnits(value);
         break;
     default:
         ASSERT_NOT_REACHED();
         break;
     }
 
     // Since we mix css <length> values with svg's length values we need to
     // clamp values to the narrowest range, otherwise it can result in
     // rendering issues.
     return CSSPrimitiveValue::clampToCSSLengthRange(userUnits);
 }
 
-float SVGLengthContext::convertValueFromUserUnits(float value, SVGLengthMode mode, SVGLengthType toUnit) const
+float SVGLengthContext::convertValueFromUserUnits(float value, SVGLengthMode mode, CSSPrimitiveValue::UnitType toUnit) const
 {
     switch (toUnit) {
-    case LengthTypeUnknown:
+    case CSSPrimitiveValue::UnitType::Unknown:
         return 0;

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

this might be an ASSERT_NOT_REACHED case (i.e. let default catch it)

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

Done.

-    case LengthTypeNumber:
+    case CSSPrimitiveValue::UnitType::Pixels:
+    case CSSPrimitiveValue::UnitType::Number:
+    case CSSPrimitiveValue::UnitType::UserUnits:
         return value;
-    case LengthTypePercentage: {
+    case CSSPrimitiveValue::UnitType::Percentage: {
         FloatSize viewportSize;
         if (!determineViewport(viewportSize))
             return 0;
         float dimension = dimensionForLengthMode(mode, viewportSize);
         if (!dimension)
             return 0;
         // LengthTypePercentage is represented with 100% = 100.0.
         // Good for accuracy but could eventually be changed.
         return value * 100 / dimension;
     }
-    case LengthTypeEMS:
+    case CSSPrimitiveValue::UnitType::Ems:
         return convertValueFromUserUnitsToEMS(computedStyleForLengthResolving(m_context), value);
-    case LengthTypeEXS:
+    case CSSPrimitiveValue::UnitType::Exs:
         return convertValueFromUserUnitsToEXS(value);
-    case LengthTypeREMS:
+    case CSSPrimitiveValue::UnitType::Rems:
         return convertValueFromUserUnitsToEMS(rootElementStyle(m_context), value);
-    case LengthTypeCHS:
+    case CSSPrimitiveValue::UnitType::Chs:
         return convertValueFromUserUnitsToCHS(value);
-    case LengthTypePX:
-        return value;
-    case LengthTypeCM:
+    case CSSPrimitiveValue::UnitType::Centimeters:
         return value / cssPixelsPerCentimeter;
-    case LengthTypeMM:
+    case CSSPrimitiveValue::UnitType::Millimeters:
         return value / cssPixelsPerMillimeter;
-    case LengthTypeIN:
+    case CSSPrimitiveValue::UnitType::Inches:
         return value / cssPixelsPerInch;
-    case LengthTypePT:
+    case CSSPrimitiveValue::UnitType::Points:
         return value / cssPixelsPerPoint;
-    case LengthTypePC:
+    case CSSPrimitiveValue::UnitType::Picas:
         return value / cssPixelsPerPica;
+    default:
+        break;
     }
 
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 float SVGLengthContext::convertValueFromUserUnitsToCHS(float value) const
 {
     const ComputedStyle* style = computedStyleForLengthResolving(m_context);
     if (!style)
@@ skipping 59 matching lines @@
 
     const SVGSVGElement& svg = toSVGSVGElement(*viewportElement);
     viewportSize = svg.currentViewBoxRect().size();
     if (viewportSize.isEmpty())
         viewportSize = svg.currentViewportSize();
 
     return true;
 }
 
 }