Move 'id'-related invalidation to SVGElement::attributeChanged

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

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann
  * <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 900 matching lines @@
     return;
 
   toSVGElement(parent)->sendSVGLoadEventToSelfAndAncestorChainIfPossible();
 }
 
 void SVGElement::attributeChanged(const AttributeModificationParams& params) {
   Element::attributeChanged(
       AttributeModificationParams(params.name, params.oldValue, params.newValue,
                                   AttributeModificationReason::kDirectly));
 
-  if (params.name == HTMLNames::idAttr)
+  if (params.name == HTMLNames::idAttr) {
     rebuildAllIncomingReferences();
 
+    LayoutObject* object = layoutObject();
+    // Notify resources about id changes, this is important as we cache
+    // resources by id in SVGDocumentExtensions
+    if (object && object->isSVGResourceContainer())
+      toLayoutSVGResourceContainer(object)->idChanged();
+    if (isConnected())
+      buildPendingResourcesIfNeeded();
+    invalidateInstances();
+    return;
+  }
+
   // Changes to the style attribute are processed lazily (see
   // Element::getAttribute() and related methods), so we don't want changes to
   // the style attribute to result in extra work here.
   if (params.name == HTMLNames::styleAttr)
     return;
 
   svgAttributeBaseValChanged(params.name);
 }
 
 void SVGElement::svgAttributeChanged(const QualifiedName& attrName) {
   CSSPropertyID propId = SVGElement::cssPropertyIdForSVGAttributeName(attrName);
   if (propId > 0) {
     invalidateInstances();
     return;
   }
 
   if (attrName == HTMLNames::classAttr) {
     classAttributeChanged(AtomicString(m_className->currentValue()->value()));
     invalidateInstances();
     return;
   }
-
-  if (attrName == HTMLNames::idAttr) {
-    LayoutObject* object = layoutObject();
-    // Notify resources about id changes, this is important as we cache
-    // resources by id in SVGDocumentExtensions
-    if (object && object->isSVGResourceContainer())
-      toLayoutSVGResourceContainer(object)->idChanged();
-    if (isConnected())
-      buildPendingResourcesIfNeeded();
-    invalidateInstances();
-    return;
-  }
 }
 
 void SVGElement::svgAttributeBaseValChanged(const QualifiedName& attribute) {
   svgAttributeChanged(attribute);
 
   if (!hasSVGRareData() || svgRareData()->webAnimatedAttributes().isEmpty())
     return;
 
   // TODO(alancutter): Only mark attributes as dirty if their animation depends
   // on the underlying value.
@@ skipping 317 matching lines @@
   visitor->trace(m_className);
   Element::trace(visitor);
 }
 
 const AtomicString& SVGElement::eventParameterName() {
   DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt"));
   return evtString;
 }
 
 }  // namespace blink