Split active animation interpolation storage between standard and custom properties

third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CSSAnimationUpdate_h
 #define CSSAnimationUpdate_h
 
 #include "core/animation/EffectStack.h"
 #include "core/animation/InertEffect.h"
 #include "core/animation/Interpolation.h"
@@ skipping 86 matching lines @@
  public:
   CSSAnimationUpdate() {}
 
   ~CSSAnimationUpdate() {}
 
   void Copy(const CSSAnimationUpdate& update) {
     DCHECK(IsEmpty());
     new_animations_ = update.NewAnimations();
     animations_with_updates_ = update.AnimationsWithUpdates();
     new_transitions_ = update.NewTransitions();
-    active_interpolations_for_animations_ =
-        update.ActiveInterpolationsForAnimations();
+    active_interpolations_for_custom_animations_ =
+        update.ActiveInterpolationsForCustomAnimations();
+    active_interpolations_for_standard_animations_ =
+        update.ActiveInterpolationsForStandardAnimations();
     active_interpolations_for_custom_transitions_ =
         update.ActiveInterpolationsForCustomTransitions();
     active_interpolations_for_standard_transitions_ =
         update.ActiveInterpolationsForStandardTransitions();
     cancelled_animation_indices_ = update.CancelledAnimationIndices();
     animation_indices_with_pause_toggled_ =
         update.AnimationIndicesWithPauseToggled();
     cancelled_transitions_ = update.CancelledTransitions();
     finished_transitions_ = update.FinishedTransitions();
     updated_compositor_keyframes_ = update.UpdatedCompositorKeyframes();
   }
 
   void Clear() {
     new_animations_.clear();
     animations_with_updates_.clear();
     new_transitions_.clear();
-    active_interpolations_for_animations_.clear();
+    active_interpolations_for_custom_animations_.clear();
+    active_interpolations_for_standard_animations_.clear();
     active_interpolations_for_custom_transitions_.clear();
     active_interpolations_for_standard_transitions_.clear();
     cancelled_animation_indices_.clear();
     animation_indices_with_pause_toggled_.clear();
     cancelled_transitions_.clear();
     finished_transitions_.clear();
     updated_compositor_keyframes_.clear();
   }
 
   void StartAnimation(const AtomicString& animation_name,
@@ skipping 93 matching lines @@
   };
   using NewTransitionMap = HeapHashMap<PropertyHandle, NewTransition>;
   const NewTransitionMap& NewTransitions() const { return new_transitions_; }
   const HashSet<PropertyHandle>& CancelledTransitions() const {
     return cancelled_transitions_;
   }
   const HashSet<PropertyHandle>& FinishedTransitions() const {
     return finished_transitions_;
   }
 
-  void AdoptActiveInterpolationsForAnimations(
+  void AdoptActiveInterpolationsForCustomAnimations(
       ActiveInterpolationsMap& new_map) {
-    new_map.swap(active_interpolations_for_animations_);
+    new_map.swap(active_interpolations_for_custom_animations_);
+  }
+  void AdoptActiveInterpolationsForStandardAnimations(
+      ActiveInterpolationsMap& new_map) {
+    new_map.swap(active_interpolations_for_standard_animations_);
   }
   void AdoptActiveInterpolationsForCustomTransitions(
       ActiveInterpolationsMap& new_map) {
     new_map.swap(active_interpolations_for_custom_transitions_);
   }
   void AdoptActiveInterpolationsForStandardTransitions(
       ActiveInterpolationsMap& new_map) {
     new_map.swap(active_interpolations_for_standard_transitions_);
   }
-  const ActiveInterpolationsMap& ActiveInterpolationsForAnimations() const {
-    return active_interpolations_for_animations_;
+  const ActiveInterpolationsMap& ActiveInterpolationsForCustomAnimations()
+      const {
+    return active_interpolations_for_custom_animations_;
+  }
+  ActiveInterpolationsMap& ActiveInterpolationsForCustomAnimations() {
+    return active_interpolations_for_custom_animations_;
+  }
+  const ActiveInterpolationsMap& ActiveInterpolationsForStandardAnimations()
+      const {
+    return active_interpolations_for_standard_animations_;
+  }
+  ActiveInterpolationsMap& ActiveInterpolationsForStandardAnimations() {
+    return active_interpolations_for_standard_animations_;
   }
   const ActiveInterpolationsMap& ActiveInterpolationsForCustomTransitions()
       const {
     return active_interpolations_for_custom_transitions_;
   }
   const ActiveInterpolationsMap& ActiveInterpolationsForStandardTransitions()
       const {
     return active_interpolations_for_standard_transitions_;
   }
-  ActiveInterpolationsMap& ActiveInterpolationsForAnimations() {
-    return active_interpolations_for_animations_;
-  }
 
   bool IsEmpty() const {
     return new_animations_.IsEmpty() &&
            cancelled_animation_indices_.IsEmpty() &&
            suppressed_animations_.IsEmpty() &&
            animation_indices_with_pause_toggled_.IsEmpty() &&
            animations_with_updates_.IsEmpty() && new_transitions_.IsEmpty() &&
            cancelled_transitions_.IsEmpty() &&
            finished_transitions_.IsEmpty() &&
-           active_interpolations_for_animations_.IsEmpty() &&
+           active_interpolations_for_custom_animations_.IsEmpty() &&
+           active_interpolations_for_standard_animations_.IsEmpty() &&
            active_interpolations_for_custom_transitions_.IsEmpty() &&
            active_interpolations_for_standard_transitions_.IsEmpty() &&
            updated_compositor_keyframes_.IsEmpty();
   }
 
   DEFINE_INLINE_TRACE() {
     visitor->Trace(new_transitions_);
     visitor->Trace(new_animations_);
     visitor->Trace(suppressed_animations_);
     visitor->Trace(animations_with_updates_);
     visitor->Trace(updated_compositor_keyframes_);
   }
 
  private:
   // Order is significant since it defines the order in which new animations
   // will be started. Note that there may be multiple animations present
   // with the same name, due to the way in which we split up animations with
   // incomplete keyframes.
   HeapVector<NewCSSAnimation> new_animations_;
   Vector<size_t> cancelled_animation_indices_;
   HeapHashSet<Member<const Animation>> suppressed_animations_;
   Vector<size_t> animation_indices_with_pause_toggled_;
   HeapVector<UpdatedCSSAnimation> animations_with_updates_;
   HeapVector<Member<Animation>> updated_compositor_keyframes_;
 
   NewTransitionMap new_transitions_;
   HashSet<PropertyHandle> cancelled_transitions_;
   HashSet<PropertyHandle> finished_transitions_;
 
-  ActiveInterpolationsMap active_interpolations_for_animations_;
+  ActiveInterpolationsMap active_interpolations_for_custom_animations_;
+  ActiveInterpolationsMap active_interpolations_for_standard_animations_;
   ActiveInterpolationsMap active_interpolations_for_custom_transitions_;
   ActiveInterpolationsMap active_interpolations_for_standard_transitions_;
 
   friend class PendingAnimationUpdate;
 };
 
 }  // namespace blink
 
 #endif