Make SVGLength wrap a CSSPrimitiveValue.

third_party/WebKit/Source/core/svg/SVGLength.h

Index: third_party/WebKit/Source/core/svg/SVGLength.h
diff --git a/third_party/WebKit/Source/core/svg/SVGLength.h b/third_party/WebKit/Source/core/svg/SVGLength.h
index 088acd07cdab2f80885d992fe1e9402add7ae9d0..e396a5d50c8738334fa842187fe4744ac051abfa 100644
--- a/third_party/WebKit/Source/core/svg/SVGLength.h
+++ b/third_party/WebKit/Source/core/svg/SVGLength.h
@@ -47,23 +47,20 @@ public:
         return adoptRefWillBeNoop(new SVGLength(mode));
     }
 
+    DECLARE_VIRTUAL_TRACE();
+
     PassRefPtrWillBeRawPtr<SVGLength> clone() const;
     PassRefPtrWillBeRawPtr<SVGPropertyBase> cloneForAnimation(const String&) const override;
 
-    SVGLengthType unitType() const { return static_cast<SVGLengthType>(m_unitType); }
+    CSSPrimitiveValue::UnitType typeWithCalcResolved() const { return m_value->typeWithCalcResolved(); }
     CSSPrimitiveValue::UnitType cssUnitTypeQuirk() const
     {
-        if (m_unitType == LengthTypeNumber)
+        if (m_value->typeWithCalcResolved() == CSSPrimitiveValue::UnitType::Number)
             return CSSPrimitiveValue::UnitType::Pixels;
 
-        if (m_unitType == LengthTypeREMS)
-            return CSSPrimitiveValue::UnitType::Rems;
-        if (m_unitType == LengthTypeCHS)
-            return CSSPrimitiveValue::UnitType::Chs;
-
-        return static_cast<CSSPrimitiveValue::UnitType>(m_unitType);
+        return m_value->typeWithCalcResolved();
     }
-    void setUnitType(SVGLengthType);
+    void setUnitType(CSSPrimitiveValue::UnitType);
     SVGLengthMode unitMode() const { return static_cast<SVGLengthMode>(m_unitMode); }
 
     bool operator==(const SVGLength&) const;
@@ -72,8 +69,11 @@ public:
     float value(const SVGLengthContext&) const;
     void setValue(float, const SVGLengthContext&);
 
-    float valueInSpecifiedUnits() const { return m_valueInSpecifiedUnits; }
-    void setValueInSpecifiedUnits(float value) { m_valueInSpecifiedUnits = value; }
+    float valueInSpecifiedUnits() const { return m_value->getFloatValue(); }
+    void setValueInSpecifiedUnits(float value)
+    {
+        m_value = CSSPrimitiveValue::create(value, m_value->typeWithCalcResolved());
+    }
 
     // Resolves LengthTypePercentage into a normalized floating point number (full value is 1.0).
     float valueAsPercentage() const;
@@ -87,23 +87,22 @@ public:
     String valueAsString() const override;
     void setValueAsString(const String&, ExceptionState&);
 
-    void newValueSpecifiedUnits(SVGLengthType, float valueInSpecifiedUnits);
-    void convertToSpecifiedUnits(SVGLengthType, const SVGLengthContext&);
+    void newValueSpecifiedUnits(CSSPrimitiveValue::UnitType, float valueInSpecifiedUnits);
+    void convertToSpecifiedUnits(CSSPrimitiveValue::UnitType, const SVGLengthContext&);
 
     // Helper functions
-    static inline bool isRelativeUnit(SVGLengthType unitType)
+    static inline bool isRelativeUnit(CSSPrimitiveValue::UnitType unitType)
     {
-        return unitType == LengthTypePercentage
-            || unitType == LengthTypeEMS
-            || unitType == LengthTypeEXS
-            || unitType == LengthTypeREMS
-            || unitType == LengthTypeCHS;
-    }
-    inline bool isRelative() const { return isRelativeUnit(unitType()); }
+        return unitType == CSSPrimitiveValue::UnitType::Percentage
+            || unitType == CSSPrimitiveValue::UnitType::Ems
+            || unitType == CSSPrimitiveValue::UnitType::Exs
+            || unitType == CSSPrimitiveValue::UnitType::Rems
+            || unitType == CSSPrimitiveValue::UnitType::Chs;    }

[fs, 2015/10/28 20:14:34]

} on next line.

+    inline bool isRelative() const { return isRelativeUnit(m_value->typeWithCalcResolved()); }
 
     bool isZero() const
     {
-        return !m_valueInSpecifiedUnits;
+        return m_value->getFloatValue() == 0;
     }
 
     static SVGLengthMode lengthModeForAnimatedLengthAttribute(const QualifiedName&);
@@ -118,9 +117,8 @@ private:
     SVGLength(SVGLengthMode);
     SVGLength(const SVGLength&);
 
-    float m_valueInSpecifiedUnits;
+    RefPtrWillBeMember<CSSPrimitiveValue> m_value;
     unsigned m_unitMode : 2;
-    unsigned m_unitType : 4;
 };
 
 inline PassRefPtrWillBeRawPtr<SVGLength> toSVGLength(PassRefPtrWillBeRawPtr<SVGPropertyBase> passBase)