Rework SMIL animation target invalidation

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 87 matching lines @@
 
 }  // unnamed namespace
 
 SVGAnimateElement::SVGAnimateElement(const QualifiedName& tagName,
                                      Document& document)
     : SVGAnimationElement(tagName, document),
       m_type(AnimatedUnknown),
       m_cssPropertyId(CSSPropertyInvalid),
       m_fromPropertyValueType(RegularPropertyValue),
       m_toPropertyValueType(RegularPropertyValue),
-      m_attributeType(AttributeTypeAuto),
-      m_hasInvalidCSSAttributeType(false) {}
+      m_attributeType(AttributeTypeAuto) {}
 
 SVGAnimateElement* SVGAnimateElement::create(Document& document) {
   return new SVGAnimateElement(SVGNames::animateTag, document);
 }
 
 SVGAnimateElement::~SVGAnimateElement() {}
 
 bool SVGAnimateElement::isSVGAnimationAttributeSettingJavaScriptURL(
     const Attribute& attribute) const {
   if ((attribute.name() == SVGNames::fromAttr ||
@@ skipping 87 matching lines @@
 AnimatedPropertyType SVGAnimateElement::animatedPropertyType() {
   if (!targetElement())
     return AnimatedUnknown;
   resolveTargetProperty();
   return m_type;
 }
 
 bool SVGAnimateElement::hasValidTarget() {
   if (!SVGAnimationElement::hasValidTarget())
     return false;
-  if (!hasValidAttributeName())
+  if (attributeName() == anyQName())
     return false;
   resolveTargetProperty();
-  return m_type != AnimatedUnknown && !m_hasInvalidCSSAttributeType;
-}
-
-bool SVGAnimateElement::hasValidAttributeName() const {
-  return attributeName() != anyQName();
+  if (m_type == AnimatedUnknown)
+    return false;
+  // Always animate CSS properties using the ApplyCSSAnimation code path,
+  // regardless of the attributeType value.
+  // If attributeType="CSS" and attributeName doesn't point to a CSS property,
+  // ignore the animation.
+  return isTargetAttributeCSSProperty(*targetElement(), attributeName()) ||
+         getAttributeType() != AttributeTypeCSS;
 }
 
 bool SVGAnimateElement::shouldApplyAnimation(
     const SVGElement& targetElement,
     const QualifiedName& attributeName) {
-  if (!hasValidTarget() || !targetElement.parentNode())
-    return false;
-
-  // Always animate CSS properties using the ApplyCSSAnimation code path,
-  // regardless of the attributeType value.
-  if (isTargetAttributeCSSProperty(targetElement, attributeName))
-    return true;
-
-  // If attributeType="CSS" and attributeName doesn't point to a CSS property,
-  // ignore the animation.
-  return getAttributeType() != AttributeTypeCSS;
+  return targetElement.parentNode() && hasValidTarget();
 }
 
 SVGPropertyBase* SVGAnimateElement::createPropertyForAttributeAnimation(
     const String& value) const {
   // SVG DOM animVal animation code-path.
   // TransformList must be animated via <animateTransform>, and its
   // {from,by,to} attribute values needs to be parsed w.r.t. its "type"
   // attribute. Spec:
   // http://www.w3.org/TR/SVG/single-page.html#animate-AnimateTransformElement
   DCHECK_NE(m_type, AnimatedTransformList);
@@ skipping 299 matching lines @@
 float SVGAnimateElement::calculateDistance(const String& fromString,
                                            const String& toString) {
   DCHECK(targetElement());
   // FIXME: A return value of float is not enough to support paced animations on
   // lists.
   SVGPropertyBase* fromValue = createPropertyForAnimation(fromString);
   SVGPropertyBase* toValue = createPropertyForAnimation(toString);
   return fromValue->calculateDistance(toValue, targetElement());
 }
 
-void SVGAnimateElement::setTargetElement(SVGElement* target) {
-  SVGAnimationElement::setTargetElement(target);
-  checkInvalidCSSAttributeType();
+void SVGAnimateElement::willChangeAnimationTarget() {
+  SVGAnimationElement::willChangeAnimationTarget();
+  if (targetElement())
+    clearAnimatedType();
+}
+
+void SVGAnimateElement::didChangeAnimationTarget() {
+  SVGAnimationElement::didChangeAnimationTarget();
   resetAnimatedPropertyType();
 }
 
 void SVGAnimateElement::setAttributeName(const QualifiedName& attributeName) {
-  unscheduleIfScheduled();
-  if (targetElement())
-    clearAnimatedType();
+  willChangeAnimationTarget();
   m_attributeName = attributeName;
-  schedule();
-  checkInvalidCSSAttributeType();
-  resetAnimatedPropertyType();
+  didChangeAnimationTarget();
 }
 
 void SVGAnimateElement::setAttributeType(const AtomicString& attributeType) {
+  willChangeAnimationTarget();
   if (attributeType == "CSS")
     m_attributeType = AttributeTypeCSS;
   else if (attributeType == "XML")
     m_attributeType = AttributeTypeXML;
   else
     m_attributeType = AttributeTypeAuto;
-  checkInvalidCSSAttributeType();
-}
-
-void SVGAnimateElement::checkInvalidCSSAttributeType() {
-  bool hasInvalidCSSAttributeType =
-      targetElement() && hasValidAttributeName() &&
-      getAttributeType() == AttributeTypeCSS &&
-      !isTargetAttributeCSSProperty(*targetElement(), attributeName());
-
-  if (hasInvalidCSSAttributeType != m_hasInvalidCSSAttributeType) {
-    if (hasInvalidCSSAttributeType)
-      unscheduleIfScheduled();
-
-    m_hasInvalidCSSAttributeType = hasInvalidCSSAttributeType;
-
-    if (!hasInvalidCSSAttributeType)
-      schedule();
-  }
-
-  // Clear values that may depend on the previous target.
-  if (targetElement())
-    clearAnimatedType();
+  didChangeAnimationTarget();
 }
 
 void SVGAnimateElement::resetAnimatedPropertyType() {
   DCHECK(!m_animatedValue);
   m_fromProperty.clear();
   m_toProperty.clear();
   m_toAtEndOfDurationProperty.clear();
   clearTargetProperty();
 }
 
 DEFINE_TRACE(SVGAnimateElement) {
   visitor->trace(m_fromProperty);
   visitor->trace(m_toProperty);
   visitor->trace(m_toAtEndOfDurationProperty);
   visitor->trace(m_animatedValue);
   visitor->trace(m_targetProperty);
   SVGAnimationElement::trace(visitor);
 }
 
 }  // namespace blink