Split active animation interpolation storage between standard and custom properties

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

Index: third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h
diff --git a/third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h b/third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h
index 7c0ef5bf6f792cff8465156bd5816e9866af5fac..485cd3c7c7333dcccc03bbed87e33e633c369293 100644
--- a/third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h
+++ b/third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h
@@ -104,8 +104,10 @@ class CSSAnimationUpdate final {
     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_ =
@@ -122,7 +124,8 @@ class CSSAnimationUpdate final {
     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();
@@ -236,9 +239,13 @@ class CSSAnimationUpdate final {
     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) {
@@ -248,8 +255,19 @@ class CSSAnimationUpdate final {
       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 {
@@ -259,9 +277,6 @@ class CSSAnimationUpdate final {
       const {
     return active_interpolations_for_standard_transitions_;
   }
-  ActiveInterpolationsMap& ActiveInterpolationsForAnimations() {
-    return active_interpolations_for_animations_;
-  }
 
   bool IsEmpty() const {
     return new_animations_.IsEmpty() &&
@@ -271,7 +286,8 @@ class CSSAnimationUpdate final {
            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();
@@ -301,7 +317,8 @@ class CSSAnimationUpdate final {
   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_;