SVG: SVGAnimateElement should not cache |m_animatedElements|

Source/core/svg/SVGAnimateElement.cpp

 /*
  * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. 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 159 matching lines @@
 
     SVGElement* targetElement = this->targetElement();
     const QualifiedName& attributeName = this->attributeName();
     ShouldApplyAnimation shouldApply = shouldApplyAnimation(targetElement, attributeName);
 
     if (shouldApply == DontApplyAnimation)
         return;
 
     if (shouldApply == ApplyXMLAnimation) {
         // SVG DOM animVal animation code-path.
-        m_animatedElements = findElementInstances(targetElement);
-        ASSERT(!m_animatedElements.isEmpty());
+        WillBeHeapVector<RawPtrWillBeMember<SVGElement> > animatedElements = findElementInstances(targetElement);
+        ASSERT(!animatedElements.isEmpty());
 
-        WillBeHeapVector<RawPtrWillBeMember<SVGElement> >::const_iterator end = m_animatedElements.end();
-        for (WillBeHeapVector<RawPtrWillBeMember<SVGElement> >::const_iterator it = m_animatedElements.begin(); it != end; ++it)
+        WillBeHeapVector<RawPtrWillBeMember<SVGElement> >::const_iterator end = animatedElements.end();
+        for (WillBeHeapVector<RawPtrWillBeMember<SVGElement> >::const_iterator it = animatedElements.begin(); it != end; ++it)
             document().accessSVGExtensions().addElementReferencingTarget(this, *it);
 
         if (!m_animatedProperty)
-            m_animatedProperty = animator->startAnimValAnimation(m_animatedElements);
+            m_animatedProperty = animator->startAnimValAnimation(animatedElements);
         else
-            m_animatedProperty = animator->resetAnimValToBaseVal(m_animatedElements);
+            m_animatedProperty = animator->resetAnimValToBaseVal(animatedElements);
 
         return;
     }
 
     // CSS properties animation code-path.
-    ASSERT(m_animatedElements.isEmpty());
     String baseValue;
 
     if (shouldApply == ApplyCSSAnimation) {
         ASSERT(SVGAnimationElement::isTargetAttributeCSSProperty(targetElement, attributeName));
         computeCSSPropertyValue(targetElement, cssPropertyID(attributeName.localName()), baseValue);
     }
 
     m_animatedProperty = animator->constructFromString(baseValue);
 }
 
@@ skipping 88 matching lines @@
 void SVGAnimateElement::clearAnimatedType(SVGElement* targetElement)
 {
     if (!m_animatedProperty)
         return;
 
     if (!targetElement) {
         m_animatedProperty.clear();
         return;
     }
 
-    if (m_animatedElements.isEmpty()) {
+    if (ensureAnimator()->isAnimatingCSSProperty()) {
         // CSS properties animation code-path.
         removeCSSPropertyFromTargetAndInstances(targetElement, attributeName());
         m_animatedProperty.clear();
         return;
     }
 
     // SVG DOM animVal animation code-path.
     if (m_animator) {
-        m_animator->stopAnimValAnimation(m_animatedElements);
+        WillBeHeapVector<RawPtrWillBeMember<SVGElement> > animatedElements = findElementInstances(targetElement);
+        m_animator->stopAnimValAnimation(animatedElements);
         notifyTargetAndInstancesAboutAnimValChange(targetElement, attributeName());
     }
 
-    m_animatedElements.clear();
     m_animatedProperty.clear();
 }
 
 void SVGAnimateElement::applyResultsToTarget()
 {
     ASSERT(m_animatedPropertyType != AnimatedTransformList || isSVGAnimateTransformElement(*this));
     ASSERT(m_animatedPropertyType != AnimatedUnknown);
     ASSERT(m_animator);
 
     // Early exit if our animated type got destructed by a previous endedActiveInterval().
     if (!m_animatedProperty)
         return;
 
-    if (m_animatedElements.isEmpty()) {
+    if (ensureAnimator()->isAnimatingCSSProperty()) {
         // CSS properties animation code-path.
         // Convert the result of the animation to a String and apply it as CSS property on the target & all instances.
         applyCSSPropertyToTargetAndInstances(targetElement(), attributeName(), m_animatedProperty->valueAsString());
         return;
     }
 
     // SVG DOM animVal animation code-path.
     // At this point the SVG DOM values are already changed, unlike for CSS.
     // We only have to trigger update notifications here.
     notifyTargetAndInstancesAboutAnimValChange(targetElement(), attributeName());
@@ skipping 58 matching lines @@
 SVGAnimatedTypeAnimator* SVGAnimateElement::ensureAnimator()
 {
     if (!m_animator)
         m_animator = SVGAnimatedTypeAnimator::create(m_animatedPropertyType, this, targetElement());
     ASSERT(m_animatedPropertyType == m_animator->type());
     return m_animator.get();
 }
 
 void SVGAnimateElement::trace(Visitor* visitor)
 {
-#if ENABLE(OILPAN)
-    visitor->trace(m_animatedElements);
-#endif
     visitor->trace(m_animator);
     SVGAnimationElement::trace(visitor);
 }
 
 }