Rework SMIL animation target invalidation

third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 540 matching lines @@
   } else if (attrName == SVGNames::minAttr) {
     m_cachedMin = invalidCachedTime;
   } else if (attrName == SVGNames::maxAttr) {
     m_cachedMax = invalidCachedTime;
   } else if (attrName.matches(SVGNames::hrefAttr) ||
              attrName.matches(XLinkNames::hrefAttr)) {
     // TODO(fs): Could be smarter here when 'href' is specified and 'xlink:href'
     // is changed.
     SVGElement::InvalidationGuard invalidationGuard(this);
     buildPendingResource();
-    if (m_targetElement)
-      clearAnimatedType();
   } else {
     SVGElement::svgAttributeChanged(attrName);
     return;
   }
 
   animationAttributeChanged();
 }
 
 void SVGSMILElement::connectSyncBaseConditions() {
   if (m_syncBaseConditionsConnected)
@@ skipping 24 matching lines @@
 }
 
 void SVGSMILElement::disconnectEventBaseConditions() {
   for (Condition* condition : m_conditions) {
     if (condition->getType() == Condition::EventBase)
       condition->disconnectEventBase(*this);
   }
 }
 
 void SVGSMILElement::setTargetElement(SVGElement* target) {
-  unscheduleIfScheduled();
+  willChangeAnimationTarget();
 
-  if (m_targetElement) {
-    // Clear values that may depend on the previous target.
-    clearAnimatedType();
+  // Clear values that may depend on the previous target.
+  if (m_targetElement)
     disconnectSyncBaseConditions();
-  }
 
   // If the animation state is not Inactive, always reset to a clear state
   // before leaving the old target element.
   if (m_activeState != Inactive)
     endedActiveInterval();
 
   m_targetElement = target;
-  schedule();
+  didChangeAnimationTarget();
 }
 
 SMILTime SVGSMILElement::elapsed() const {
   return m_timeContainer ? m_timeContainer->elapsed() : 0;
 }
 
 bool SVGSMILElement::isFrozen() const {
   return m_activeState == Frozen;
 }
 
@@ skipping 611 matching lines @@
     dispatchEvent(RepeatEvent::create(eventType, repeatEventCount));
   } else {
     dispatchEvent(Event::create(eventType));
   }
 }
 
 bool SVGSMILElement::hasValidTarget() {
   return targetElement() && targetElement()->inActiveDocument();
 }
 
-void SVGSMILElement::schedule() {
-  DCHECK(!m_isScheduled);
-
-  if (!m_timeContainer || !hasValidTarget())
-    return;
-
-  m_timeContainer->schedule(this, m_targetElement, m_attributeName);
-  m_isScheduled = true;
-}
-
-void SVGSMILElement::unscheduleIfScheduled() {
+void SVGSMILElement::willChangeAnimationTarget() {
   if (!m_isScheduled)
     return;
-
   DCHECK(m_timeContainer);
   DCHECK(m_targetElement);
   m_timeContainer->unschedule(this, m_targetElement, m_attributeName);
   m_isScheduled = false;
 }
 
+void SVGSMILElement::didChangeAnimationTarget() {
+  DCHECK(!m_isScheduled);
+  if (!m_timeContainer || !hasValidTarget())
+    return;
+  m_timeContainer->schedule(this, m_targetElement, m_attributeName);
+  m_isScheduled = true;
+}
+
 DEFINE_TRACE(SVGSMILElement) {
   visitor->trace(m_targetElement);
   visitor->trace(m_targetIdObserver);
   visitor->trace(m_timeContainer);
   visitor->trace(m_conditions);
   visitor->trace(m_syncBaseDependents);
   SVGElement::trace(visitor);
   SVGTests::trace(visitor);
 }
 
 }  // namespace blink