Remove |SMILTimeContainer::active_sandwiches_|

We no longer have a need for it - SMILAnimationSandwich::IsEmpty()
will never return true in the loop in UpdateIntervals().

Tidy up the loops to use the Values() proxy.

Bug: 998526
Change-Id: Ic7ebda4aece0989692293f3407c7f17c804495a3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1796667
Commit-Queue: Fredrik Söderquist <fs@opera.com>
Reviewed-by: Philip Rogers <pdr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#695954}

third_party/blink/renderer/core/svg/animation/smil_time_container.cc

@@ -461,23 +461,15 @@ void SMILTimeContainer::RemoveUnusedKeys() {
 }
 
 void SMILTimeContainer::UpdateIntervals(SMILTime document_time) {
-  // This Shrink should free up the memory from the previous
-  // run in this loop. Otherwise it won't do anything.
   DCHECK(document_time.IsFinite());
   DCHECK(document_time >= 0.0);
   do {
     intervals_dirty_ = false;
-    active_sandwiches_.Shrink(0);
-    for (auto& entry : scheduled_animations_) {
-      auto* sandwich = entry.value.Get();
-      sandwich->UpdateTiming(document_time.Value());
 
-      if (!sandwich->IsEmpty()) {
-        active_sandwiches_.push_back(sandwich);
-      }
-    }
+    for (auto& sandwich : scheduled_animations_.Values())
+      sandwich->UpdateTiming(document_time.Value());
 
-    for (auto& sandwich : active_sandwiches_)
+    for (auto& sandwich : scheduled_animations_.Values())
       sandwich->UpdateSyncBases(document_time.Value());
   } while (intervals_dirty_);
 }
@@ -502,7 +494,6 @@ void SMILTimeContainer::UpdateAnimationTimings(double presentation_time) {
   if (intervals_dirty_)
     UpdateIntervals(latest_update_time_);
 
-  active_sandwiches_.ReserveCapacity(scheduled_animations_.size());
   while (latest_update_time_ < presentation_time) {
     const SMILTime interesting_time = NextInterestingTime(latest_update_time_);
     latest_update_time_ =
@@ -517,12 +508,11 @@ void SMILTimeContainer::ApplyAnimationValues(double elapsed) {
   prevent_scheduled_animations_changes_ = true;
 #endif
   HeapVector<Member<SVGSMILElement>> animations_to_apply;
-  for (auto& sandwich : active_sandwiches_) {
+  for (auto& sandwich : scheduled_animations_.Values()) {
     sandwich->UpdateActiveAnimationStack(elapsed);
     if (SVGSMILElement* animation = sandwich->ApplyAnimationValues())
       animations_to_apply.push_back(animation);
   }
-  active_sandwiches_.Shrink(0);
 
   if (animations_to_apply.IsEmpty()) {
 #if DCHECK_IS_ON()
@@ -568,7 +558,6 @@ void SMILTimeContainer::AdvanceFrameForTesting() {
 void SMILTimeContainer::Trace(blink::Visitor* visitor) {
   visitor->Trace(scheduled_animations_);
   visitor->Trace(owner_svg_element_);
-  visitor->Trace(active_sandwiches_);
 }
 
 }  // namespace blink

third_party/blink/renderer/core/svg/animation/smil_time_container.h

@@ -147,7 +147,6 @@ class SMILTimeContainer final
   TaskRunnerTimer<SMILTimeContainer> animation_policy_once_timer_;
 
   AnimationsMap scheduled_animations_;
-  HeapVector<Member<SMILAnimationSandwich>> active_sandwiches_;
 
   Member<SVGSVGElement> owner_svg_element_;