Refactor SVGAnimatedLength negative values mode

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

Index: third_party/WebKit/Source/core/svg/SVGLength.cpp
diff --git a/third_party/WebKit/Source/core/svg/SVGLength.cpp b/third_party/WebKit/Source/core/svg/SVGLength.cpp
index 075649fe8654ad8732510410bd30e21a07c1b5be..97b0eedda46051af49f4cb1456ac38ab9039450b 100644
--- a/third_party/WebKit/Source/core/svg/SVGLength.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGLength.cpp
@@ -197,6 +197,7 @@ SVGLengthMode SVGLength::lengthModeForAnimatedLengthAttribute(const QualifiedNam
         s_lengthModeMap.set(SVGNames::cyAttr, SVGLengthMode::Height);
         s_lengthModeMap.set(SVGNames::dxAttr, SVGLengthMode::Width);
         s_lengthModeMap.set(SVGNames::dyAttr, SVGLengthMode::Height);
+        s_lengthModeMap.set(SVGNames::frAttr, SVGLengthMode::Other);
         s_lengthModeMap.set(SVGNames::fxAttr, SVGLengthMode::Width);
         s_lengthModeMap.set(SVGNames::fyAttr, SVGLengthMode::Height);
         s_lengthModeMap.set(SVGNames::rAttr, SVGLengthMode::Other);
@@ -222,6 +223,44 @@ SVGLengthMode SVGLength::lengthModeForAnimatedLengthAttribute(const QualifiedNam
     return SVGLengthMode::Other;
 }
 
+SVGLengthNegativeValuesMode SVGLength::negativeValuesModeForAnimatedLengthAttribute(const QualifiedName& attrName)
+{
+    typedef HashMap<QualifiedName, SVGLengthNegativeValuesMode> NegativeValuesModeForLengthAttributeMap;
+    DEFINE_STATIC_LOCAL(NegativeValuesModeForLengthAttributeMap, s_negativeValuesModeMap, ());
+
+    if (s_negativeValuesModeMap.isEmpty()) {
+        s_negativeValuesModeMap.set(SVGNames::xAttr, SVGLengthNegativeValuesMode::AllowNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::yAttr, SVGLengthNegativeValuesMode::AllowNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::cxAttr, SVGLengthNegativeValuesMode::AllowNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::cyAttr, SVGLengthNegativeValuesMode::AllowNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::dxAttr, SVGLengthNegativeValuesMode::AllowNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::dyAttr, SVGLengthNegativeValuesMode::AllowNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::frAttr, SVGLengthNegativeValuesMode::ForbidNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::fxAttr, SVGLengthNegativeValuesMode::AllowNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::fyAttr, SVGLengthNegativeValuesMode::AllowNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::rAttr, SVGLengthNegativeValuesMode::ForbidNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::rxAttr, SVGLengthNegativeValuesMode::ForbidNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::ryAttr, SVGLengthNegativeValuesMode::ForbidNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::widthAttr, SVGLengthNegativeValuesMode::ForbidNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::heightAttr, SVGLengthNegativeValuesMode::ForbidNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::x1Attr, SVGLengthNegativeValuesMode::AllowNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::x2Attr, SVGLengthNegativeValuesMode::AllowNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::y1Attr, SVGLengthNegativeValuesMode::AllowNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::y2Attr, SVGLengthNegativeValuesMode::AllowNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::refXAttr, SVGLengthNegativeValuesMode::AllowNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::refYAttr, SVGLengthNegativeValuesMode::AllowNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::markerWidthAttr, SVGLengthNegativeValuesMode::ForbidNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::markerHeightAttr, SVGLengthNegativeValuesMode::ForbidNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::textLengthAttr, SVGLengthNegativeValuesMode::ForbidNegativeLengths);
+        s_negativeValuesModeMap.set(SVGNames::startOffsetAttr, SVGLengthNegativeValuesMode::AllowNegativeLengths);
+    }
+
+    if (s_negativeValuesModeMap.contains(attrName))
+        return s_negativeValuesModeMap.get(attrName);
+
+    return SVGLengthNegativeValuesMode::AllowNegativeLengths;

[alancutter (OOO until 2018), 2015/12/02 03:55:34]

ASSERT_NOT_REACHED();

[fs, 2015/12/02 14:45:42]

Actually, since this is essentially a "binary" value (allow/forbid), I think it
would make sense to use a HashSet instead, and let that contain the QNames that
needs ForbidNegativeLengths. This also means that we can save on the hash
lookups (contains() will suffice.) Could just make this helper return a bool
then and remove the enum.

(Similarly the SVGLengthMode map above shouldn't need to store Other, but we
should probably add a comment to that effect too. I've pondered getting rid of
that one too just like this...)

+}
+
 void SVGLength::add(PassRefPtrWillBeRawPtr<SVGPropertyBase> other, SVGElement* contextElement)
 {
     SVGLengthContext lengthContext(contextElement);