Remove isSupportedAttribute in svg

Source/core/svg/SVGEllipseElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 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 @@
 {
     visitor->trace(m_cx);
     visitor->trace(m_cy);
     visitor->trace(m_rx);
     visitor->trace(m_ry);
     SVGGeometryElement::trace(visitor);
 }
 
 DEFINE_NODE_FACTORY(SVGEllipseElement)
 
-bool SVGEllipseElement::isSupportedAttribute(const QualifiedName& attrName)
-{
-    DEFINE_STATIC_LOCAL(HashSet<QualifiedName>, supportedAttributes, ());
-    if (supportedAttributes.isEmpty()) {
-        supportedAttributes.add(SVGNames::cxAttr);
-        supportedAttributes.add(SVGNames::cyAttr);
-        supportedAttributes.add(SVGNames::rxAttr);
-        supportedAttributes.add(SVGNames::ryAttr);
-    }
-    return supportedAttributes.contains<SVGAttributeHashTranslator>(attrName);
-}
-
 bool SVGEllipseElement::isPresentationAttribute(const QualifiedName& attrName) const
 {
     if (attrName == SVGNames::cxAttr || attrName == SVGNames::cyAttr
         || attrName == SVGNames::rxAttr || attrName == SVGNames::ryAttr)
         return true;
     return SVGGeometryElement::isPresentationAttribute(attrName);
 }
 
 bool SVGEllipseElement::isPresentationAttributeWithSVGDOM(const QualifiedName& attrName) const
 {
@@ skipping 14 matching lines @@
         addSVGLengthPropertyToPresentationAttributeStyle(style, CSSPropertyRx, *m_rx->currentValue());
     else if (property == m_ry)
         addSVGLengthPropertyToPresentationAttributeStyle(style, CSSPropertyRy, *m_ry->currentValue());
     else
         SVGGeometryElement::collectStyleForPresentationAttribute(name, value, style);
 }
 
 
 void SVGEllipseElement::svgAttributeChanged(const QualifiedName& attrName)
 {
-    if (!isSupportedAttribute(attrName)) {
-        SVGGeometryElement::svgAttributeChanged(attrName);
+    SVGElement::InvalidationGuard invalidationGuard(this);
+
+    bool lengthAttrs =
+        attrName == SVGNames::cxAttr || attrName == SVGNames::cyAttr
+        || attrName == SVGNames::rxAttr || attrName == SVGNames::ryAttr;
+
+    if (lengthAttrs) {
+        invalidateSVGPresentationAttributeStyle();
+        setNeedsStyleRecalc(LocalStyleChange,
+            StyleChangeReasonForTracing::fromAttribute(attrName));
+        updateRelativeLengthsInformation();
+    }
+
+    if (lengthAttrs) {

[fs, 2015/04/10 14:25:24]

Join these two blocks, and then put the InvalidationGuard in that scope.

[Erik Dahlström (inactive), 2015/04/10 15:33:44]

Done.

+        LayoutSVGShape* object = toLayoutSVGShape(this->layoutObject());
+        if (!object)
+            return;
+
+        object->setNeedsShapeUpdate();
+        markForLayoutAndParentResourceInvalidation(object);
         return;
     }
 
-    SVGElement::InvalidationGuard invalidationGuard(this);
-
-    invalidateSVGPresentationAttributeStyle();
-    setNeedsStyleRecalc(LocalStyleChange,
-        StyleChangeReasonForTracing::fromAttribute(attrName));
-    updateRelativeLengthsInformation();
-
-    LayoutSVGShape* renderer = toLayoutSVGShape(this->layoutObject());
-    if (!renderer)
-        return;
-
-    renderer->setNeedsShapeUpdate();
-    markForLayoutAndParentResourceInvalidation(renderer);
+    SVGGeometryElement::svgAttributeChanged(attrName);
 }
 
 bool SVGEllipseElement::selfHasRelativeLengths() const
 {
     return m_cx->currentValue()->isRelative()
         || m_cy->currentValue()->isRelative()
         || m_rx->currentValue()->isRelative()
         || m_ry->currentValue()->isRelative();
 }
 
 LayoutObject* SVGEllipseElement::createLayoutObject(const ComputedStyle&)
 {
     return new LayoutSVGEllipse(this);
 }
 
 } // namespace blink