Hoist updateAnimation() calls from SVGSMILElement::progress

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 442 matching lines @@
             continue;
         }
 
         // Sort according to priority. Elements with later begin time have higher priority.
         // In case of a tie, document order decides.
         // FIXME: This should also consider timing relationships between the elements. Dependents
         // have higher priority.
         copyToVector(*entry.value, scheduledAnimationsInSameGroup);
         std::sort(scheduledAnimationsInSameGroup.begin(), scheduledAnimationsInSameGroup.end(), PriorityCompare(elapsed));
 
-        SVGSMILElement* resultElement = nullptr;
+        AnimationsVector sandwich;
         for (const auto& itAnimation : scheduledAnimationsInSameGroup) {
             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;
-                resultElement->lockAnimatedType();
-            }
-
-            // This will calculate the contribution from the animation and add it to the resultElement.
-            if (!animation->progress(elapsed, resultElement, seekToTime) && resultElement == animation) {
-                resultElement->unlockAnimatedType();
-                resultElement->clearAnimatedType();
-                resultElement = nullptr;
+            // This will calculate the contribution from the animation and update timing.
+            if (animation->progress(elapsed, seekToTime)) {
+                sandwich.append(animation);
+            } else {
+                animation->clearAnimatedType();
             }
 
             SMILTime nextFireTime = animation->nextProgressTime();
             if (nextFireTime.isFinite())
                 earliestFireTime = std::min(nextFireTime, earliestFireTime);
         }
 
-        if (resultElement) {
+        if (!sandwich.isEmpty()) {
+            // Results are accumulated to the first animation that animates and
+            // contributes to a particular element/attribute pair.
+            // Only reset the animated type to the base value once for
+            // the lowest priority animation that animates and
+            // contributes to a particular element/attribute pair.
+            SVGSMILElement* resultElement = sandwich.first();
+            resultElement->resetAnimatedType();
+
+            // Go through the sandwich from lowest prio to highest and generate
+            // the animated value (if any.)
+            for (const auto& animation : sandwich)
+                animation->updateAnimatedValue(resultElement);
+
             animationsToApply.append(resultElement);
-            resultElement->unlockAnimatedType();
         }
     }
     m_scheduledAnimations.removeAll(invalidKeys);
 
     std::sort(animationsToApply.begin(), animationsToApply.end(), PriorityCompare(elapsed));
 
     unsigned animationsToApplySize = animationsToApply.size();
     if (!animationsToApplySize) {
 #if ENABLE(ASSERT)
         m_preventScheduledAnimationsChanges = false;
@@ skipping 34 matching lines @@
     setElapsed(elapsed() + initialFrameDelay);
 }
 
 DEFINE_TRACE(SMILTimeContainer)
 {
     visitor->trace(m_scheduledAnimations);
     visitor->trace(m_ownerSVGElement);
 }
 
 } // namespace blink