Refactor SVGAnimatedLength negative values mode

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

 /*
  * Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  *
  * 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.
  *
@@ skipping 179 matching lines @@
     typedef HashMap<QualifiedName, SVGLengthMode> LengthModeForLengthAttributeMap;
     DEFINE_STATIC_LOCAL(LengthModeForLengthAttributeMap, s_lengthModeMap, ());
 
     if (s_lengthModeMap.isEmpty()) {
         s_lengthModeMap.set(SVGNames::xAttr, SVGLengthMode::Width);
         s_lengthModeMap.set(SVGNames::yAttr, SVGLengthMode::Height);
         s_lengthModeMap.set(SVGNames::cxAttr, SVGLengthMode::Width);
         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);
         s_lengthModeMap.set(SVGNames::rxAttr, SVGLengthMode::Width);
         s_lengthModeMap.set(SVGNames::ryAttr, SVGLengthMode::Height);
         s_lengthModeMap.set(SVGNames::widthAttr, SVGLengthMode::Width);
         s_lengthModeMap.set(SVGNames::heightAttr, SVGLengthMode::Height);
         s_lengthModeMap.set(SVGNames::x1Attr, SVGLengthMode::Width);
         s_lengthModeMap.set(SVGNames::x2Attr, SVGLengthMode::Width);
         s_lengthModeMap.set(SVGNames::y1Attr, SVGLengthMode::Height);
         s_lengthModeMap.set(SVGNames::y2Attr, SVGLengthMode::Height);
         s_lengthModeMap.set(SVGNames::refXAttr, SVGLengthMode::Width);
         s_lengthModeMap.set(SVGNames::refYAttr, SVGLengthMode::Height);
         s_lengthModeMap.set(SVGNames::markerWidthAttr, SVGLengthMode::Width);
         s_lengthModeMap.set(SVGNames::markerHeightAttr, SVGLengthMode::Height);
         s_lengthModeMap.set(SVGNames::textLengthAttr, SVGLengthMode::Width);
         s_lengthModeMap.set(SVGNames::startOffsetAttr, SVGLengthMode::Width);
     }
 
     if (s_lengthModeMap.contains(attrName))
         return s_lengthModeMap.get(attrName);
 
     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);
     setValue(value(lengthContext) + toSVGLength(other)->value(lengthContext), lengthContext);
 }
 
 void SVGLength::calculateAnimatedValue(SVGAnimationElement* animationElement,
     float percentage,
     unsigned repeatCount,
     PassRefPtrWillBeRawPtr<SVGPropertyBase> fromValue,
@@ skipping 19 matching lines @@
 
 float SVGLength::calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBase> toValue, SVGElement* contextElement)
 {
     SVGLengthContext lengthContext(contextElement);
     RefPtrWillBeRawPtr<SVGLength> toLength = toSVGLength(toValue);
 
     return fabsf(toLength->value(lengthContext) - value(lengthContext));
 }
 
 }