SVG: SVGAnimateElement should not cache |m_animatedElements|

Source/core/svg/SVGDocumentExtensions.cpp

 /*
  * Copyright (C) 2006 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 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.
  *
@@ skipping 13 matching lines @@
 
 #include "XLinkNames.h"
 #include "core/dom/Document.h"
 #include "core/rendering/RenderView.h"
 #include "core/rendering/svg/SVGResourcesCache.h"
 #include "core/svg/SVGFontFaceElement.h"
 #include "core/svg/SVGSVGElement.h"
 #include "core/svg/SVGViewSpec.h"
 #include "core/svg/SVGZoomAndPan.h"
 #include "core/svg/animation/SMILTimeContainer.h"
+#include "core/svg/animation/SVGSMILElement.h"
 #include "wtf/TemporaryChange.h"
 #include "wtf/text/AtomicString.h"
 
 namespace WebCore {
 
 SVGDocumentExtensions::SVGDocumentExtensions(Document* document)
     : m_document(document)
     , m_resourcesCache(adoptPtr(new SVGResourcesCache))
 #if !ASSERT_DISABLED
     , m_inRelativeLengthSVGRootsInvalidation(false)
@@ skipping 300 matching lines @@
             continue;
 
         referencingElements->remove(setIt);
         if (referencingElements->isEmpty())
             toBeRemoved.append(referencedElement);
     }
 
     m_elementDependencies.removeAll(toBeRemoved);
 }
 
-void SVGDocumentExtensions::rebuildAllElementReferencesForTarget(SVGElement* referencedElement)
+void SVGDocumentExtensions::rebuildAllElementReferencesForTarget(SVGElement* referencedElement, bool onlySMILElements)

[esprehn, 2014/05/23 04:38:17]

An enum would be nicer, then it's more clear. SmileElementsOnly vs AllElements
or something.

[kouhei (in TOK), 2014/05/23 07:17:15]

Done.

 {
     ASSERT(referencedElement);
     HashMap<SVGElement*, OwnPtr<HashSet<SVGElement*> > >::iterator it = m_elementDependencies.find(referencedElement);
     if (it == m_elementDependencies.end())
         return;
     ASSERT(it->key == referencedElement);
     Vector<SVGElement*> toBeNotified;
 
     HashSet<SVGElement*>* referencingElements = it->value.get();
     HashSet<SVGElement*>::iterator setEnd = referencingElements->end();
     for (HashSet<SVGElement*>::iterator setIt = referencingElements->begin(); setIt != setEnd; ++setIt)
         toBeNotified.append(*setIt);
 
     // Force rebuilding the referencingElement so it knows about this change.
     Vector<SVGElement*>::iterator vectorEnd = toBeNotified.end();
     for (Vector<SVGElement*>::iterator vectorIt = toBeNotified.begin(); vectorIt != vectorEnd; ++vectorIt) {
         // Before rebuilding referencingElement ensure it was not removed from under us.
-        if (HashSet<SVGElement*>* referencingElements = setOfElementsReferencingTarget(referencedElement)) {
-            if (referencingElements->contains(*vectorIt))
-                (*vectorIt)->svgAttributeChanged(XLinkNames::hrefAttr);
-        }
+        HashSet<SVGElement*>* referencingElements = setOfElementsReferencingTarget(referencedElement);
+        if (!referencingElements || !referencingElements->contains(*vectorIt))
+            continue;
+
+        if (onlySMILElements && !isSVGSMILElement(**vectorIt))
+            continue;
+
+        (*vectorIt)->svgAttributeChanged(XLinkNames::hrefAttr);
     }
 }
 
+void SVGDocumentExtensions::rebuildSMILElementReferencesForTarget(SVGElement* referencedElement)
+{
+    rebuildAllElementReferencesForTarget(referencedElement, true);
+}
+
 void SVGDocumentExtensions::removeAllElementReferencesForTarget(SVGElement* referencedElement)
 {
     ASSERT(referencedElement);
     HashMap<SVGElement*, OwnPtr<HashSet<SVGElement*> > >::iterator it = m_elementDependencies.find(referencedElement);
     if (it == m_elementDependencies.end())
         return;
     ASSERT(it->key == referencedElement);
 
     m_elementDependencies.remove(it);
 }
@@ skipping 90 matching lines @@
 }
 
 void SVGDocumentExtensions::trace(Visitor* visitor)
 {
     visitor->trace(m_timeContainers);
     visitor->trace(m_svgFontFaceElements);
     visitor->trace(m_pendingSVGFontFaceElementsForRemoval);
 }
 
 }