Move clearAnimatedType() up the stack

third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.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 463 matching lines @@
             SVGSMILElement* animation = itAnimation.get();
             ASSERT(animation->timeContainer() == this);
             ASSERT(animation->targetElement());
             ASSERT(animation->hasValidAttributeName());
             ASSERT(animation->hasValidAttributeType());
 
             // Results are accumulated to the first animation that animates and contributes to a particular element/attribute pair.
             if (!resultElement)
                 resultElement = animation;
 
-            // This will calculate the contribution from the animation and add it to the resultsElement.
-            if (!animation->progress(elapsed, resultElement, seekToTime) && resultElement == animation)
+            // This will calculate the contribution from the animation and add it to the resultElement.
+            if (!animation->progress(elapsed, resultElement, seekToTime) && resultElement == animation) {
+                resultElement->clearAnimatedType();
                 resultElement = nullptr;
+            }
 
             SMILTime nextFireTime = animation->nextProgressTime();
             if (nextFireTime.isFinite())
                 earliestFireTime = std::min(nextFireTime, earliestFireTime);
         }
 
         if (resultElement)
             animationsToApply.append(resultElement);
     }
     m_scheduledAnimations.removeAll(invalidKeys);
@@ skipping 39 matching lines @@
     setElapsed(elapsed().value() + initialFrameDelay);
 }
 
 DEFINE_TRACE(SMILTimeContainer)
 {
     visitor->trace(m_scheduledAnimations);
     visitor->trace(m_ownerSVGElement);
 }
 
 } // namespace blink