Remove isSupportedAttribute in svg

Source/core/svg/SVGImageElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Rob Buis <buis@kde.org>
  * Copyright (C) 2006 Alexander Kellett <lypanov@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.
  *
@@ skipping 56 matching lines @@
     if (LayoutSVGImage* renderSVGImage = toLayoutSVGImage(layoutObject())) {
         if (renderSVGImage->imageResource()->hasImage()) {
             if (Image* image = renderSVGImage->imageResource()->cachedImage()->image())
                 return image->currentFrameHasSingleSecurityOrigin();
         }
     }
 
     return true;
 }
 
-bool SVGImageElement::isSupportedAttribute(const QualifiedName& attrName)
-{
-    DEFINE_STATIC_LOCAL(HashSet<QualifiedName>, supportedAttributes, ());
-    if (supportedAttributes.isEmpty()) {
-        SVGURIReference::addSupportedAttributes(supportedAttributes);
-        supportedAttributes.add(SVGNames::xAttr);
-        supportedAttributes.add(SVGNames::yAttr);
-        supportedAttributes.add(SVGNames::widthAttr);
-        supportedAttributes.add(SVGNames::heightAttr);
-        supportedAttributes.add(SVGNames::preserveAspectRatioAttr);
-    }
-    return supportedAttributes.contains<SVGAttributeHashTranslator>(attrName);
-}
-
 bool SVGImageElement::isPresentationAttribute(const QualifiedName& attrName) const
 {
     if (attrName == SVGNames::xAttr || attrName == SVGNames::yAttr
         || attrName == SVGNames::widthAttr || attrName == SVGNames::heightAttr)
         return true;
     return SVGGraphicsElement::isPresentationAttribute(attrName);
 }
 
 bool SVGImageElement::isPresentationAttributeWithSVGDOM(const QualifiedName& attrName) const
 {
@@ skipping 14 matching lines @@
     else if (property == m_x)
         addSVGLengthPropertyToPresentationAttributeStyle(style, CSSPropertyX, *m_x->currentValue());
     else if (property == m_y)
         addSVGLengthPropertyToPresentationAttributeStyle(style, CSSPropertyY, *m_y->currentValue());
     else
         SVGGraphicsElement::collectStyleForPresentationAttribute(name, value, style);
 }
 
 void SVGImageElement::svgAttributeChanged(const QualifiedName& attrName)
 {
-    if (!isSupportedAttribute(attrName)) {
-        SVGGraphicsElement::svgAttributeChanged(attrName);
-        return;
-    }
-
-    SVGElement::InvalidationGuard invalidationGuard(this);
-
     bool isLengthAttribute = attrName == SVGNames::xAttr
                           || attrName == SVGNames::yAttr
                           || attrName == SVGNames::widthAttr
                           || attrName == SVGNames::heightAttr;
 
     if (isLengthAttribute) {

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

I think we should either move this down to just before the other
isLengthAttribute block, or move that one up - which is best will boil down to
the frequency of update. Feels the length attrs should be more common, so I
guess that means moving the later block earlier.

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

Done.

         invalidateSVGPresentationAttributeStyle();
         setNeedsStyleRecalc(LocalStyleChange,
             StyleChangeReasonForTracing::fromAttribute(attrName));
         updateRelativeLengthsInformation();
     }
 
     if (SVGURIReference::isKnownAttribute(attrName)) {
+        SVGElement::InvalidationGuard invalidationGuard(this);
         if (inDocument())
             imageLoader().updateFromElement(ImageLoader::UpdateIgnorePreviousError);
         else
             m_needsLoaderURIUpdate = true;
         return;
     }
 
-    LayoutObject* renderer = this->layoutObject();
-    if (!renderer)
-        return;
+    if (isLengthAttribute || attrName == SVGNames::preserveAspectRatioAttr) {
+        SVGElement::InvalidationGuard invalidationGuard(this);
 
-    if (isLengthAttribute || attrName == SVGNames::preserveAspectRatioAttr) {
+        LayoutObject* object = this->layoutObject();
+        if (!object)
+            return;
+
         // FIXME: if isLengthAttribute then we should avoid this
         // call if the viewport didn't change, however since we don't
         // have the computed style yet we can't use updateImageViewport.
         // See http://crbug.com/466200.
-        markForLayoutAndParentResourceInvalidation(renderer);
+        markForLayoutAndParentResourceInvalidation(object);
         return;
     }
 
-    ASSERT_NOT_REACHED();
+    SVGGraphicsElement::svgAttributeChanged(attrName);
 }
 
 bool SVGImageElement::selfHasRelativeLengths() const
 {
     return m_x->currentValue()->isRelative()
         || m_y->currentValue()->isRelative()
         || m_width->currentValue()->isRelative()
         || m_height->currentValue()->isRelative();
 }
 
@@ skipping 45 matching lines @@
     return AtomicString(hrefString());
 }
 
 void SVGImageElement::didMoveToNewDocument(Document& oldDocument)
 {
     imageLoader().elementDidMoveToNewDocument();
     SVGGraphicsElement::didMoveToNewDocument(oldDocument);
 }
 
 } // namespace blink