CC Animation: Use ElementId to attach CC animation players.

ui/compositor/layer_animator.h

 // Copyright (c) 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.
 
 #ifndef UI_COMPOSITOR_LAYER_ANIMATOR_H_
 #define UI_COMPOSITOR_LAYER_ANIMATOR_H_
 
 #include <deque>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "cc/animation/animation_delegate.h"
 #include "cc/animation/target_property.h"
+#include "cc/trees/element_id.h"
 #include "ui/compositor/compositor_export.h"
 #include "ui/compositor/layer_animation_element.h"
 #include "ui/compositor/layer_threaded_animation_delegate.h"
 #include "ui/gfx/animation/tween.h"
 
 namespace cc {
 class Animation;
 class AnimationPlayer;
 class AnimationTimeline;
 class ElementAnimations;
@@ skipping 325 matching lines @@
   void NotifyAnimationTakeover(
       base::TimeTicks monotonic_time,
       cc::TargetProperty::Type target_property,
       double animation_start_time,
       std::unique_ptr<cc::AnimationCurve> curve) override {}
 
   // Implementation of LayerThreadedAnimationDelegate.
   void AddThreadedAnimation(std::unique_ptr<cc::Animation> animation) override;
   void RemoveThreadedAnimation(int animation_id) override;
 
-  void AttachLayerToAnimationPlayer(int layer_id);
-  void DetachLayerFromAnimationPlayer();
+  void AttachElementToAnimationPlayer(cc::ElementId element_id);
+  void DetachElementFromAnimationPlayer();
 
   // This is the queue of animations to run.
   AnimationQueue animation_queue_;
 
   // The target of all layer animations.
   LayerAnimationDelegate* delegate_;
 
   // Plays CC animations.
   scoped_refptr<cc::AnimationPlayer> animation_player_;
 
@@ skipping 35 matching lines @@
   // ResetCompositor/SetCompositor scope.
   // TODO(loyso): Remove it. crbug.com/592873.
   scoped_refptr<cc::ElementAnimations> element_animations_state_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerAnimator);
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_LAYER_ANIMATOR_H_