Make SVGLength wrap a CSSPrimitiveValue.

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

 /*
  * Copyright (C) 2014 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 22 matching lines @@
 #include "core/svg/SVGLengthTearOff.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/svg/SVGElement.h"
 
 namespace blink {
 
 namespace {
 
-inline SVGLengthType toSVGLengthType(unsigned short type)
+inline bool isValidLengthUnit(unsigned short type)
 {
-    ASSERT(type >= LengthTypeUnknown && type <= LengthTypePC);
-    return static_cast<SVGLengthType>(type);
+    return type != (unsigned short)CSSPrimitiveValue::UnitType::Unknown
+        && type <= (unsigned short)CSSPrimitiveValue::UnitType::Picas;

[fs, 2015/10/23 20:28:59]

Nit: Use static_cast

 }
 
 inline bool canResolveRelativeUnits(const SVGElement* contextElement)
 {
     return contextElement && contextElement->inDocument();
 }
 
+inline CSSPrimitiveValue::UnitType toCSSUnitType(unsigned short type)
+{
+    ASSERT(isValidLengthUnit(type));
+    return static_cast<CSSPrimitiveValue::UnitType>(type);
+}
+
+inline SVGLengthType toSVGLengthType(CSSPrimitiveValue::UnitType type)
+{
+    switch (type) {
+    case CSSPrimitiveValue::UnitType::Unknown:
+        return LengthTypeUnknown;
+    case CSSPrimitiveValue::UnitType::Number:
+        return LengthTypeNumber;
+    case CSSPrimitiveValue::UnitType::Percentage:
+        return LengthTypePercentage;
+    case CSSPrimitiveValue::UnitType::Ems:
+        return LengthTypeEMS;
+    case CSSPrimitiveValue::UnitType::Exs:
+        return LengthTypeEXS;
+    case CSSPrimitiveValue::UnitType::Pixels:
+        return LengthTypePX;
+    case CSSPrimitiveValue::UnitType::Centimeters:
+        return LengthTypeCM;
+    case CSSPrimitiveValue::UnitType::Millimeters:
+        return LengthTypeMM;
+    case CSSPrimitiveValue::UnitType::Inches:
+        return LengthTypeIN;
+    case CSSPrimitiveValue::UnitType::Points:
+        return LengthTypePT;
+    case CSSPrimitiveValue::UnitType::Picas:
+        return LengthTypePC;
+    default:
+        return LengthTypeUnknown;
+    }
+}
 } // namespace
 
 SVGLengthType SVGLengthTearOff::unitType()
 {
-    return hasExposedLengthUnit() ? target()->unitType() : LengthTypeUnknown;
+    return hasExposedLengthUnit() ? toSVGLengthType(target()->typeWithCalcResolved()) : LengthTypeUnknown;
 }
 
 SVGLengthMode SVGLengthTearOff::unitMode()
 {
     return target()->unitMode();
 }
 
 float SVGLengthTearOff::value(ExceptionState& exceptionState)
 {
     if (target()->isRelative() && !canResolveRelativeUnits(contextElement())) {
@@ skipping 63 matching lines @@
     commitChange();
 }
 
 void SVGLengthTearOff::newValueSpecifiedUnits(unsigned short unitType, float valueInSpecifiedUnits, ExceptionState& exceptionState)
 {
     if (isImmutable()) {
         exceptionState.throwDOMException(NoModificationAllowedError, "The object is read-only.");
         return;
     }
 
-    if (unitType == LengthTypeUnknown || unitType > LengthTypePC) {
+    if (!isValidLengthUnit(unitType)) {
         exceptionState.throwDOMException(NotSupportedError, "Cannot set value with unknown or invalid units (" + String::number(unitType) + ").");
         return;
     }
 
-    target()->newValueSpecifiedUnits(toSVGLengthType(unitType), valueInSpecifiedUnits);
+    target()->newValueSpecifiedUnits(toCSSUnitType(unitType), valueInSpecifiedUnits);
     commitChange();
 }
 
 void SVGLengthTearOff::convertToSpecifiedUnits(unsigned short unitType, ExceptionState& exceptionState)
 {
     if (isImmutable()) {
         exceptionState.throwDOMException(NoModificationAllowedError, "The object is read-only.");
         return;
     }
 
-    if (unitType == LengthTypeUnknown || unitType > LengthTypePC) {
+    if (!isValidLengthUnit(unitType)) {
         exceptionState.throwDOMException(NotSupportedError, "Cannot convert to unknown or invalid units (" + String::number(unitType) + ").");
         return;
     }
 
-    if ((target()->isRelative() || SVGLength::isRelativeUnit(toSVGLengthType(unitType)))
+    if ((target()->isRelative() || SVGLength::isRelativeUnit(toCSSUnitType(unitType)))
         && !canResolveRelativeUnits(contextElement())) {
         exceptionState.throwDOMException(NotSupportedError, "Could not resolve relative length.");
         return;
     }
 
     SVGLengthContext lengthContext(contextElement());
-    target()->convertToSpecifiedUnits(toSVGLengthType(unitType), lengthContext);
+    target()->convertToSpecifiedUnits(toCSSUnitType(unitType), lengthContext);
     commitChange();
 }
 
 SVGLengthTearOff::SVGLengthTearOff(PassRefPtrWillBeRawPtr<SVGLength> target, SVGElement* contextElement, PropertyIsAnimValType propertyIsAnimVal, const QualifiedName& attributeName)
     : SVGPropertyTearOff<SVGLength>(target, contextElement, propertyIsAnimVal, attributeName)
 {
 }
 
 }