[svg2] Make SVGLength wrap a CSSPrimitiveValue

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 32 matching lines @@
     typedef SVGLengthTearOff TearOffType;
 
     static PassRefPtrWillBeRawPtr<SVGLength> create(SVGLengthMode mode = SVGLengthMode::Other)
     {
         return adoptRefWillBeNoop(new SVGLength(mode));
     }
 
     PassRefPtrWillBeRawPtr<SVGLength> clone() const;
     virtual PassRefPtrWillBeRawPtr<SVGPropertyBase> cloneForAnimation(const String&) const override;
 
-    SVGLengthType unitType() const { return static_cast<SVGLengthType>(m_unitType); }
+    CSSPrimitiveValue* getCSSPrimitiveValue() { return m_value.get(); }

[pdr., 2015/05/28 21:28:19]

It looks like this is only used to access the primitiveType. Can you just expose
"UnitType primitiveType() { return m_value->primitiveType(); } const"?

[Erik Dahlström, 2015/06/02 11:57:44]

Sure.

+
+    static CSSPrimitiveValue::UnitType toCSSUnit(SVGLengthType type)
+    {
+        switch (type) {
+        case LengthTypeUnknown:
+            return CSSPrimitiveValue::UnitType::CSS_UNKNOWN;
+        case LengthTypeNumber:
+            return CSSPrimitiveValue::UnitType::CSS_NUMBER;
+        case LengthTypePercentage:
+            return CSSPrimitiveValue::UnitType::CSS_PERCENTAGE;
+        case LengthTypeEMS:
+            return CSSPrimitiveValue::UnitType::CSS_EMS;
+        case LengthTypeEXS:
+            return CSSPrimitiveValue::UnitType::CSS_EXS;
+        case LengthTypePX:
+            return CSSPrimitiveValue::UnitType::CSS_PX;
+        case LengthTypeCM:
+            return CSSPrimitiveValue::UnitType::CSS_CM;
+        case LengthTypeMM:
+            return CSSPrimitiveValue::UnitType::CSS_MM;
+        case LengthTypeIN:
+            return CSSPrimitiveValue::UnitType::CSS_IN;
+        case LengthTypePT:
+            return CSSPrimitiveValue::UnitType::CSS_PT;
+        case LengthTypePC:
+            return CSSPrimitiveValue::UnitType::CSS_PC;
+        default:
+            return CSSPrimitiveValue::UnitType::CSS_UNKNOWN;
+        }
+    }
+
     CSSPrimitiveValue::UnitType cssUnitTypeQuirk() const
     {
-        if (m_unitType == LengthTypeNumber)
+        if (m_value->primitiveType() == CSSPrimitiveValue::UnitType::CSS_NUMBER)
             return CSSPrimitiveValue::UnitType::CSS_PX;
 
-        if (m_unitType == LengthTypeREMS)
-            return CSSPrimitiveValue::UnitType::CSS_REMS;
-        if (m_unitType == LengthTypeCHS)
-            return CSSPrimitiveValue::UnitType::CSS_CHS;
-
-        return static_cast<CSSPrimitiveValue::UnitType>(m_unitType);
+        return m_value->primitiveType();
     }
-    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->primitiveType());
+    }
 
     // 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;
 
     virtual 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::CSS_PERCENTAGE
+            || unitType == CSSPrimitiveValue::CSS_EMS
+            || unitType == CSSPrimitiveValue::CSS_EXS
+            || unitType == CSSPrimitiveValue::CSS_REMS
+            || unitType == CSSPrimitiveValue::CSS_CHS;
     }
-    inline bool isRelative() const { return isRelativeUnit(unitType()); }
+    inline bool isRelative() const { return isRelativeUnit(m_value->primitiveType()); }
 
     bool isZero() const
     {
-        return !m_valueInSpecifiedUnits;
+        return m_value->getFloatValue() == 0;
     }
 
     static PassRefPtrWillBeRawPtr<SVGLength> fromCSSPrimitiveValue(CSSPrimitiveValue*);
-    static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> toCSSPrimitiveValue(PassRefPtrWillBeRawPtr<SVGLength>);
+
     static SVGLengthMode lengthModeForAnimatedLengthAttribute(const QualifiedName&);
 
     PassRefPtrWillBeRawPtr<SVGLength> blend(PassRefPtrWillBeRawPtr<SVGLength> from, float progress) const;
 
     virtual void add(PassRefPtrWillBeRawPtr<SVGPropertyBase>, SVGElement*) override;
     virtual void calculateAnimatedValue(SVGAnimationElement*, float percentage, unsigned repeatCount, PassRefPtrWillBeRawPtr<SVGPropertyBase> from, PassRefPtrWillBeRawPtr<SVGPropertyBase> to, PassRefPtrWillBeRawPtr<SVGPropertyBase> toAtEndOfDurationValue, SVGElement* contextElement) override;
     virtual 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;

[pdr., 2015/05/28 21:28:18]

Does this need to be a pointer? I wonder if it can just be a member like
"CSSPrimitiveValue m_value";

Otherwise, can it just be an OwnPtr to avoid some overhead of ref counting?

[fs, 2015/05/29 08:09:42]

Then it'd need to be copied when it's used as a presentation attribute. (I
notice that that simplification/optimization is not in this CL though, but I'd
expect that to be a close follower.)

[fs, 2015/05/29 13:49:06]

Oh, yeah, almost forgot, Oilpan. That also means that a trace() definition is
missing.

[Erik Dahlström, 2015/06/02 11:57:44]

Ok, will add that.

[Erik Dahlström, 2015/06/02 11:57:44]

It can't be a simple member, since CSSPrimitiveValue is immutable.

     unsigned m_unitMode : 2;

[pdr., 2015/05/28 21:28:18]

Can we use CSSPrimitiveValue's LengthUnitType and get rid of this entirely?

[fs, 2015/05/29 08:09:42]

That's a different thing. In most cases it should be possible to trivially get
rid of this by specifying it at the callsite. The exception I can think of is
SVGLengthTearOff (the DOM interface for .value etc)

[Erik Dahlström, 2015/06/02 11:57:44]

Yes, it's not quite the same as LengthUnitType I think. Attempting to get rid of
this should be done separately.

-    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