Tidy up some loops in SMILTimeContainer::updateAnimations

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 481 matching lines @@
             // 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);
         }
     }
     m_scheduledAnimations.removeAll(invalidKeys);
 
-    std::sort(animationsToApply.begin(), animationsToApply.end(), PriorityCompare(elapsed));
-
-    unsigned animationsToApplySize = animationsToApply.size();
-    if (!animationsToApplySize) {
+    if (animationsToApply.isEmpty()) {
 #if ENABLE(ASSERT)
         m_preventScheduledAnimationsChanges = false;
 #endif
         return earliestFireTime;
     }
 
     UseCounter::count(&document(), UseCounter::SVGSMILAnimationAppliedEffect);
 
+    std::sort(animationsToApply.begin(), animationsToApply.end(), PriorityCompare(elapsed));
+
     // Apply results to target elements.
-    for (unsigned i = 0; i < animationsToApplySize; ++i)
-        animationsToApply[i]->applyResultsToTarget();
+    for (const auto& timedElement : animationsToApply)
+        timedElement->applyResultsToTarget();
 
 #if ENABLE(ASSERT)
     m_preventScheduledAnimationsChanges = false;
 #endif
 
-    for (unsigned i = 0; i < animationsToApplySize; ++i) {
-        if (animationsToApply[i]->isConnected() && animationsToApply[i]->isSVGDiscardElement()) {
-            SVGSMILElement* animDiscard = animationsToApply[i];
-            SVGElement* targetElement = animDiscard->targetElement();
+    for (const auto& timedElement : animationsToApply) {
+        if (timedElement->isConnected() && timedElement->isSVGDiscardElement()) {

[pdr., 2016/08/29 00:47:03]

Forever reminded of the mistakes I made reviewing SVGDiscardElement a long time
ago :(

[fs, 2016/08/29 08:14:16]

Mmm, discard, yum... (I think I know which mistake[s] that would be.)

+            SVGElement* targetElement = timedElement->targetElement();
             if (targetElement && targetElement->isConnected()) {
                 targetElement->remove(IGNORE_EXCEPTION);
-                ASSERT(!targetElement->isConnected());
+                DCHECK(!targetElement->isConnected());
             }
 
-            if (animDiscard->isConnected()) {
-                animDiscard->remove(IGNORE_EXCEPTION);
-                ASSERT(!animDiscard->isConnected());
+            if (timedElement->isConnected()) {
+                timedElement->remove(IGNORE_EXCEPTION);
+                DCHECK(!timedElement->isConnected());
             }
         }
     }
     return earliestFireTime;
 }
 
 void SMILTimeContainer::advanceFrameForTesting()
 {
     setElapsed(elapsed() + initialFrameDelay);
 }
 
 DEFINE_TRACE(SMILTimeContainer)
 {
     visitor->trace(m_scheduledAnimations);
     visitor->trace(m_ownerSVGElement);
 }
 
 } // namespace blink