Tighten SVGAnimationElement::shouldApplyAnimation

third_party/WebKit/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 160 matching lines @@
 }
 
 void SVGAnimateElement::resetAnimatedType()
 {
     SVGElement* targetElement = this->targetElement();
     const QualifiedName& attributeName = this->attributeName();
 
     m_animator.reset(targetElement);
 
     ShouldApplyAnimationType shouldApply = shouldApplyAnimation(targetElement, attributeName);
-
     if (shouldApply == DontApplyAnimation)
         return;
     if (shouldApply == ApplyXMLAnimation || shouldApply == ApplyXMLandCSSAnimation) {
         // SVG DOM animVal animation code-path.
         SVGElementInstances animatedElements = findElementInstances(targetElement);
         ASSERT(!animatedElements.isEmpty());
 
         for (SVGElement* element : animatedElements)
             addReferenceTo(element);
 
         if (!m_animatedProperty)
             m_animatedProperty = m_animator.startAnimValAnimation();
         else
             m_animatedProperty = m_animator.resetAnimValToBaseVal();
 
         return;
     }
     DCHECK_EQ(shouldApply, ApplyCSSAnimation);
 
     // CSS properties animation code-path.
     String baseValue;
     DCHECK(isTargetAttributeCSSProperty(targetElement, attributeName));
     computeCSSPropertyValue(targetElement, cssPropertyID(attributeName.localName()), baseValue);
 
     m_animatedProperty = m_animator.constructFromString(baseValue);
 }
 
-static bool targetIsUsable(SVGElement* targetElement, const QualifiedName& attribute)
-{
-    return attribute != anyQName()
-        && targetElement->isConnected() && targetElement->parentNode();
-}
-
 void SVGAnimateElement::clearAnimatedType()
 {
     if (!m_animatedProperty)
         return;
 
     // The animated property lock is held for the "result animation" (see SMILTimeContainer::updateAnimations())
     // while we're processing an animation group. We will very likely crash later if we clear the animated type
     // while the lock is held. See crbug.com/581546.
     DCHECK(!animatedTypeIsLocked());
 
     SVGElement* targetElement = this->targetElement();
     if (!targetElement) {
         m_animatedProperty.clear();
         return;
     }
 
     ShouldApplyAnimationType shouldApply = shouldApplyAnimation(targetElement, attributeName());
     if (shouldApply == ApplyXMLandCSSAnimation || m_animator.isAnimatingCSSProperty()) {
         // CSS properties animation code-path.
-        if (targetIsUsable(targetElement, attributeName())) {
+        if (shouldApply != DontApplyAnimation) {
             CSSPropertyID id = cssPropertyID(attributeName().localName());
             targetElement->ensureAnimatedSMILStyleProperties()->removeProperty(id);
             targetElement->setNeedsStyleRecalc(LocalStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::Animation));
         }
     }
     if (shouldApply == ApplyXMLandCSSAnimation || m_animator.isAnimatingSVGDom()) {
         // SVG DOM animVal animation code-path.
         m_animator.stopAnimValAnimation();
-        if (targetIsUsable(targetElement, attributeName()))
+        if (shouldApply != DontApplyAnimation)
             targetElement->invalidateAnimatedAttribute(attributeName());
     }
 
     m_animatedProperty.clear();
     m_animator.clear();
 }
 
 void SVGAnimateElement::applyResultsToTarget()
 {
     ASSERT(animatedPropertyType() != AnimatedTransformList || isSVGAnimateTransformElement(*this));
     ASSERT(animatedPropertyType() != AnimatedUnknown);
 
     // Early exit if our animated type got destructed by a previous endedActiveInterval().
     if (!m_animatedProperty)
         return;
 
     // We do update the style and the animation property independent of each other.
     ShouldApplyAnimationType shouldApply = shouldApplyAnimation(targetElement(), attributeName());
-    DCHECK(targetElement());
-    if (!targetIsUsable(targetElement(), attributeName()))
+    if (shouldApply == DontApplyAnimation)
         return;
     if (shouldApply == ApplyXMLandCSSAnimation || m_animator.isAnimatingCSSProperty()) {
         // CSS properties animation code-path.
         // Convert the result of the animation to a String and apply it as CSS property on the target.
         CSSPropertyID id = cssPropertyID(attributeName().localName());
         MutableStylePropertySet* propertySet = targetElement()->ensureAnimatedSMILStyleProperties();
         if (propertySet->setProperty(id, m_animatedProperty->valueAsString(), false, 0))
             targetElement()->setNeedsStyleRecalc(LocalStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::Animation));
     }
     if (shouldApply == ApplyXMLandCSSAnimation || m_animator.isAnimatingSVGDom()) {
@@ skipping 64 matching lines @@
 {
     visitor->trace(m_fromProperty);
     visitor->trace(m_toProperty);
     visitor->trace(m_toAtEndOfDurationProperty);
     visitor->trace(m_animatedProperty);
     visitor->trace(m_animator);
     SVGAnimationElement::trace(visitor);
 }
 
 } // namespace blink