Rename compositor_animation_id to compositor_keyframe_model_id to eliminate misleadings

Upon posting removing keyframe models events from main we are using the
name compositor_animation_ids_ which is misleading. This is a remaining
issue from the renaming patch we had before.

Bug: 807667
Change-Id: I985fff4d5073b69e8f3637b6273a6c72b7884e83
Reviewed-on: https://chromium-review.googlesource.com/1097582Reviewed-by: Stephen McGruer <smcgruer@chromium.org>
Commit-Queue: Yi Gu <yigu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567004}

third_party/blink/renderer/core/animation/compositor_animations.cc

@@ -367,9 +367,9 @@ void CompositorAnimations::StartAnimationOnCompositor(
     const Animation* animation,
     CompositorAnimation& compositor_animation,
     const EffectModel& effect,
-    Vector<int>& started_animation_ids,
+    Vector<int>& started_keyframe_model_ids,
     double animation_playback_rate) {
-  DCHECK(started_animation_ids.IsEmpty());
+  DCHECK(started_keyframe_model_ids.IsEmpty());
   DCHECK(CheckCanStartAnimationOnCompositor(timing, element, animation, effect,
                                             animation_playback_rate)
              .Ok());
@@ -385,9 +385,9 @@ void CompositorAnimations::StartAnimationOnCompositor(
   for (auto& compositor_keyframe_model : keyframe_models) {
     int id = compositor_keyframe_model->Id();
     compositor_animation.AddKeyframeModel(std::move(compositor_keyframe_model));
-    started_animation_ids.push_back(id);
+    started_keyframe_model_ids.push_back(id);
   }
-  DCHECK(!started_animation_ids.IsEmpty());
+  DCHECK(!started_keyframe_model_ids.IsEmpty());
 }
 
 void CompositorAnimations::CancelAnimationOnCompositor(

third_party/blink/renderer/core/animation/compositor_animations.h

@@ -89,16 +89,17 @@ class CORE_EXPORT CompositorAnimations {
   static void CancelIncompatibleAnimationsOnCompositor(const Element&,
                                                        const Animation&,
                                                        const EffectModel&);
-  static void StartAnimationOnCompositor(const Element&,
-                                         int group,
-                                         base::Optional<double> start_time,
-                                         double time_offset,
-                                         const Timing&,
-                                         const Animation*,
-                                         CompositorAnimation&,
-                                         const EffectModel&,
-                                         Vector<int>& started_animation_ids,
-                                         double animation_playback_rate);
+  static void StartAnimationOnCompositor(
+      const Element&,
+      int group,
+      base::Optional<double> start_time,
+      double time_offset,
+      const Timing&,
+      const Animation*,
+      CompositorAnimation&,
+      const EffectModel&,
+      Vector<int>& started_keyframe_model_ids,
+      double animation_playback_rate);
   static void CancelAnimationOnCompositor(const Element&,
                                           CompositorAnimation*,
                                           int id);

third_party/blink/renderer/core/animation/compositor_animations_test.cc

@@ -1210,10 +1210,10 @@ TEST_F(AnimationCompositorAnimationsTest,
                   .Ok());
 
   // simulate KeyframeEffect::maybeStartAnimationOnCompositor
-  Vector<int> compositor_animation_ids;
-  compositor_animation_ids.push_back(1);
-  keyframe_effect1->SetCompositorAnimationIdsForTesting(
-      compositor_animation_ids);
+  Vector<int> compositor_keyframe_model_ids;
+  compositor_keyframe_model_ids.push_back(1);
+  keyframe_effect1->SetCompositorKeyframeModelIdsForTesting(
+      compositor_keyframe_model_ids);
   EXPECT_TRUE(animation1->HasActiveAnimationsOnCompositor());
 
   // The second animation for opacity is not ok to run on compositor.

third_party/blink/renderer/core/animation/keyframe_effect.cc

@@ -251,12 +251,12 @@ void KeyframeEffect::StartAnimationOnCompositor(
   CompositorAnimations::StartAnimationOnCompositor(
       *target_, group, start_time, current_time, SpecifiedTiming(),
       GetAnimation(), *compositor_animation, *Model(),
-      compositor_animation_ids_, animation_playback_rate);
-  DCHECK(!compositor_animation_ids_.IsEmpty());
+      compositor_keyframe_model_ids_, animation_playback_rate);
+  DCHECK(!compositor_keyframe_model_ids_.IsEmpty());
 }
 
 bool KeyframeEffect::HasActiveAnimationsOnCompositor() const {
-  return !compositor_animation_ids_.IsEmpty();
+  return !compositor_keyframe_model_ids_.IsEmpty();
 }
 
 bool KeyframeEffect::HasActiveAnimationsOnCompositor(
@@ -274,11 +274,12 @@ bool KeyframeEffect::CancelAnimationOnCompositor(
     return false;
   if (!target_ || !target_->GetLayoutObject())
     return false;
-  for (const auto& compositor_animation_id : compositor_animation_ids_) {
+  for (const auto& compositor_keyframe_model_id :
+       compositor_keyframe_model_ids_) {
     CompositorAnimations::CancelAnimationOnCompositor(
-        *target_, compositor_animation, compositor_animation_id);
+        *target_, compositor_animation, compositor_keyframe_model_id);
   }
-  compositor_animation_ids_.clear();
+  compositor_keyframe_model_ids_.clear();
   return true;
 }
 
@@ -294,9 +295,10 @@ void KeyframeEffect::PauseAnimationForTestingOnCompositor(double pause_time) {
   if (!target_ || !target_->GetLayoutObject())
     return;
   DCHECK(GetAnimation());
-  for (const auto& compositor_animation_id : compositor_animation_ids_) {
+  for (const auto& compositor_keyframe_model_id :
+       compositor_keyframe_model_ids_) {
     CompositorAnimations::PauseAnimationForTestingOnCompositor(
-        *target_, *GetAnimation(), compositor_animation_id, pause_time);
+        *target_, *GetAnimation(), compositor_keyframe_model_id, pause_time);
   }
 }
 

third_party/blink/renderer/core/animation/keyframe_effect.h

@@ -113,9 +113,9 @@ class CORE_EXPORT KeyframeEffect final : public AnimationEffect {
 
   void AttachCompositedLayers();
 
-  void SetCompositorAnimationIdsForTesting(
-      const Vector<int>& compositor_animation_ids) {
-    compositor_animation_ids_ = compositor_animation_ids;
+  void SetCompositorKeyframeModelIdsForTesting(
+      const Vector<int>& compositor_keyframe_model_ids) {
+    compositor_keyframe_model_ids_ = compositor_keyframe_model_ids;
   }
 
   void DowngradeToNormal() { priority_ = kDefaultPriority; }
@@ -152,7 +152,7 @@ class CORE_EXPORT KeyframeEffect final : public AnimationEffect {
 
   Priority priority_;
 
-  Vector<int> compositor_animation_ids_;
+  Vector<int> compositor_keyframe_model_ids_;
 };
 
 DEFINE_TYPE_CASTS(KeyframeEffect,