CC Animation: Start replacing int layer_id with ElementId element_id.

cc/animation/element_animations.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 CC_ANIMATION_ELEMENT_ANIMATIONS_H_
 #define CC_ANIMATION_ELEMENT_ANIMATIONS_H_
 
 #include <bitset>
 #include <memory>
 #include <vector>
@@ skipping 25 matching lines @@
 enum class LayerTreeType;
 
 // An ElementAnimations owns a list of all AnimationPlayers, attached to
 // the layer.
 // This is a CC counterpart for blink::ElementAnimations (in 1:1 relationship).
 // No pointer to/from respective blink::ElementAnimations object for now.
 class CC_EXPORT ElementAnimations : public base::RefCounted<ElementAnimations> {
  public:
   static scoped_refptr<ElementAnimations> Create();
 
-  int layer_id() const { return layer_id_; }
-  void SetLayerId(int layer_id);
+  ElementId element_id() const { return element_id_; }
+  void SetElementId(ElementId element_id);
 
   // Parent AnimationHost.
   AnimationHost* animation_host() { return animation_host_; }
   const AnimationHost* animation_host() const { return animation_host_; }
   void SetAnimationHost(AnimationHost* host);
 
   void InitAffectedElementTypes();
   void ClearAffectedElementTypes();
 
-  void LayerRegistered(int layer_id, LayerTreeType tree_type);
-  void LayerUnregistered(int layer_id, LayerTreeType tree_type);
+  void LayerRegistered(ElementId element_id, LayerTreeType tree_type);
+  void LayerUnregistered(ElementId element_id, LayerTreeType tree_type);
 
   void AddPlayer(AnimationPlayer* player);
   void RemovePlayer(AnimationPlayer* player);
   bool IsEmpty() const;
 
   typedef base::LinkedList<AnimationPlayer> PlayersList;
   typedef base::LinkNode<AnimationPlayer> PlayersListNode;
   const PlayersList& players_list() const { return *players_list_.get(); }
 
   // Ensures that the list of active animations on the main thread and the impl
@@ skipping 182 matching lines @@
                                      TargetProperty::Type target_property,
                                      int group);
   void NotifyPlayersAnimationPropertyUpdate(const AnimationEvent& event);
   void NotifyPlayersAnimationTakeover(base::TimeTicks monotonic_time,
                                       TargetProperty::Type target_property,
                                       double animation_start_time,
                                       std::unique_ptr<AnimationCurve> curve);
 
   std::unique_ptr<PlayersList> players_list_;
   AnimationHost* animation_host_;
-  int layer_id_;
+  ElementId element_id_;
   std::vector<std::unique_ptr<Animation>> animations_;
 
   // This is used to ensure that we don't spam the animation host.
   bool is_active_;
 
   base::TimeTicks last_tick_time_;
 
   bool has_element_in_active_list_;
   bool has_element_in_pending_list_;
 
   // Only try to start animations when new animations are added or when the
   // previous attempt at starting animations failed to start all animations.
   bool needs_to_start_animations_;
 
   bool scroll_offset_animation_was_interrupted_;
 
   bool potentially_animating_transform_for_active_elements_;
   bool potentially_animating_transform_for_pending_elements_;
 
   DISALLOW_COPY_AND_ASSIGN(ElementAnimations);
 };
 
 }  // namespace cc
 
 #endif  // CC_ANIMATION_ELEMENT_ANIMATIONS_H_