Make SVGLength wrap a CSSPrimitiveValue.

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

 /*
  * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
  *
  * 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 29 matching lines @@
 
 class SVGLength final : public SVGPropertyBase {
 public:
     typedef SVGLengthTearOff TearOffType;
 
     static PassRefPtrWillBeRawPtr<SVGLength> create(SVGLengthMode mode = SVGLengthMode::Other)
     {
         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)

[fs, 2015/10/30 19:50:00]

Can we still get Number here?

[Stephen Chennney, 2015/11/03 21:59:41]

Running tests to find out.

             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;
     bool operator!=(const SVGLength& other) const { return !operator==(other); }
 
     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;
 
     // Returns a number to be used as percentage (so full value is 100)
     float valueAsPercentage100() const;
 
     // Scale the input value by this SVGLength. Higher precision than input * valueAsPercentage().
     float scaleByPercentage(float) const;
 
     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;
+        return unitType == CSSPrimitiveValue::UnitType::Percentage
+            || unitType == CSSPrimitiveValue::UnitType::Ems
+            || unitType == CSSPrimitiveValue::UnitType::Exs
+            || unitType == CSSPrimitiveValue::UnitType::Rems
+            || unitType == CSSPrimitiveValue::UnitType::Chs;
     }
-    inline bool isRelative() const { return isRelativeUnit(unitType()); }
+    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&);
 
     void add(PassRefPtrWillBeRawPtr<SVGPropertyBase>, SVGElement*) override;
     void calculateAnimatedValue(SVGAnimationElement*, float percentage, unsigned repeatCount, PassRefPtrWillBeRawPtr<SVGPropertyBase> from, PassRefPtrWillBeRawPtr<SVGPropertyBase> to, PassRefPtrWillBeRawPtr<SVGPropertyBase> toAtEndOfDurationValue, SVGElement* contextElement) override;
     float calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBase> to, SVGElement* contextElement) override;
 
     static AnimatedPropertyType classType() { return AnimatedLength; }
 
 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)
 {
     RefPtrWillBeRawPtr<SVGPropertyBase> base = passBase;
     ASSERT(base->type() == SVGLength::classType());
     return static_pointer_cast<SVGLength>(base.release());
 }
 
 } // namespace blink
 
 #endif // SVGLength_h