Revert of Use element id's for animations

cc/test/animation_test_common.cc

 // Copyright 2012 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.
 
 #include "cc/test/animation_test_common.h"
 
 #include "base/memory/ptr_util.h"
 #include "cc/animation/animation_host.h"
 #include "cc/animation/animation_id_provider.h"
 #include "cc/animation/animation_player.h"
@@ skipping 278 matching lines @@
 
   std::unique_ptr<Animation> animation(Animation::Create(
       std::move(curve), id, AnimationIdProvider::NextGroupId(),
       TargetProperty::OPACITY));
   animation->set_needs_synchronized_start_time(true);
 
   target->AddAnimation(std::move(animation));
   return id;
 }
 
-void AddAnimationToElementWithPlayer(ElementId element_id,
-                                     scoped_refptr<AnimationTimeline> timeline,
-                                     std::unique_ptr<Animation> animation) {
+void AddAnimationToLayerWithPlayer(int layer_id,
+                                   scoped_refptr<AnimationTimeline> timeline,
+                                   std::unique_ptr<Animation> animation) {
   scoped_refptr<AnimationPlayer> player =
       AnimationPlayer::Create(AnimationIdProvider::NextPlayerId());
   timeline->AttachPlayer(player);
-  player->AttachElement(element_id);
+  player->AttachElement(layer_id);
   DCHECK(player->element_animations());
   player->AddAnimation(std::move(animation));
 }
 
-void AddAnimationToElementWithExistingPlayer(
-    ElementId element_id,
+void AddAnimationToLayerWithExistingPlayer(
+    int layer_id,
     scoped_refptr<AnimationTimeline> timeline,
     std::unique_ptr<Animation> animation) {
   scoped_refptr<ElementAnimations> element_animations =
-      timeline->animation_host()->GetElementAnimationsForElementId(element_id);
+      timeline->animation_host()->GetElementAnimationsForElementId(layer_id);
   DCHECK(element_animations);
   element_animations->AddAnimation(std::move(animation));
 }
 
-void RemoveAnimationFromElementWithExistingPlayer(
-    ElementId element_id,
+void RemoveAnimationFromLayerWithExistingPlayer(
+    int layer_id,
     scoped_refptr<AnimationTimeline> timeline,
     int animation_id) {
   scoped_refptr<ElementAnimations> element_animations =
-      timeline->animation_host()->GetElementAnimationsForElementId(element_id);
+      timeline->animation_host()->GetElementAnimationsForElementId(layer_id);
   DCHECK(element_animations);
   element_animations->RemoveAnimation(animation_id);
 }
 
-Animation* GetAnimationFromElementWithExistingPlayer(
-    ElementId element_id,
+Animation* GetAnimationFromLayerWithExistingPlayer(
+    int layer_id,
     scoped_refptr<AnimationTimeline> timeline,
     int animation_id) {
   scoped_refptr<ElementAnimations> element_animations =
-      timeline->animation_host()->GetElementAnimationsForElementId(element_id);
+      timeline->animation_host()->GetElementAnimationsForElementId(layer_id);
   DCHECK(element_animations);
   return element_animations->GetAnimationById(animation_id);
 }
 
-int AddAnimatedFilterToElementWithPlayer(
-    ElementId element_id,
+int AddAnimatedFilterToLayerWithPlayer(
+    int layer_id,
     scoped_refptr<AnimationTimeline> timeline,
     double duration,
     float start_brightness,
     float end_brightness) {
   scoped_refptr<AnimationPlayer> player =
       AnimationPlayer::Create(AnimationIdProvider::NextPlayerId());
   timeline->AttachPlayer(player);
-  player->AttachElement(element_id);
+  player->AttachElement(layer_id);
   DCHECK(player->element_animations());
   return AddAnimatedFilterToPlayer(player.get(), duration, start_brightness,
                                    end_brightness);
 }
 
-int AddAnimatedTransformToElementWithPlayer(
-    ElementId element_id,
+int AddAnimatedTransformToLayerWithPlayer(
+    int layer_id,
     scoped_refptr<AnimationTimeline> timeline,
     double duration,
     int delta_x,
     int delta_y) {
   scoped_refptr<AnimationPlayer> player =
       AnimationPlayer::Create(AnimationIdProvider::NextPlayerId());
   timeline->AttachPlayer(player);
-  player->AttachElement(element_id);
+  player->AttachElement(layer_id);
   DCHECK(player->element_animations());
   return AddAnimatedTransformToPlayer(player.get(), duration, delta_x, delta_y);
 }
 
-int AddAnimatedTransformToElementWithPlayer(
-    ElementId element_id,
+int AddAnimatedTransformToLayerWithPlayer(
+    int layer_id,
     scoped_refptr<AnimationTimeline> timeline,
     double duration,
     TransformOperations start_operations,
     TransformOperations operations) {
   scoped_refptr<AnimationPlayer> player =
       AnimationPlayer::Create(AnimationIdProvider::NextPlayerId());
   timeline->AttachPlayer(player);
-  player->AttachElement(element_id);
+  player->AttachElement(layer_id);
   DCHECK(player->element_animations());
   return AddAnimatedTransformToPlayer(player.get(), duration, start_operations,
                                       operations);
 }
 
-int AddOpacityTransitionToElementWithPlayer(
-    ElementId element_id,
+int AddOpacityTransitionToLayerWithPlayer(
+    int layer_id,
     scoped_refptr<AnimationTimeline> timeline,
     double duration,
     float start_opacity,
     float end_opacity,
     bool use_timing_function) {
   scoped_refptr<AnimationPlayer> player =
       AnimationPlayer::Create(AnimationIdProvider::NextPlayerId());
   timeline->AttachPlayer(player);
-  player->AttachElement(element_id);
+  player->AttachElement(layer_id);
   DCHECK(player->element_animations());
   return AddOpacityTransitionToPlayer(player.get(), duration, start_opacity,
                                       end_opacity, use_timing_function);
 }
 
-void AbortAnimationsOnElementWithPlayer(
-    ElementId element_id,
-    scoped_refptr<AnimationTimeline> timeline,
-    TargetProperty::Type target_property) {
+void AbortAnimationsOnLayerWithPlayer(int layer_id,
+                                      scoped_refptr<AnimationTimeline> timeline,
+                                      TargetProperty::Type target_property) {
   scoped_refptr<ElementAnimations> element_animations =
-      timeline->animation_host()->GetElementAnimationsForElementId(element_id);
+      timeline->animation_host()->GetElementAnimationsForElementId(layer_id);
   DCHECK(element_animations);
   element_animations->AbortAnimations(target_property);
 }
 
 }  // namespace cc