Use element id's for animations

ui/compositor/layer_animator.cc

Index: ui/compositor/layer_animator.cc
diff --git a/ui/compositor/layer_animator.cc b/ui/compositor/layer_animator.cc
index b3474964bcfeb46668c57344a8926907631d27b6..2a47bd9ace30403e58be4667cf269eda134b1edd 100644
--- a/ui/compositor/layer_animator.cc
+++ b/ui/compositor/layer_animator.cc
@@ -156,7 +156,7 @@ void LayerAnimator::SetCompositor(Compositor* compositor) {
   // AnimationHost::RegisterPlayerForLayer via
   // AnimationHost::GetElementAnimationsForLayerId.
   if (element_animations_state_) {
-    DCHECK_EQ(element_animations_state_->element_id(),
+    DCHECK_EQ(element_animations_state_->element_id().primaryId,
               delegate_->GetCcLayer()->id());
     timeline->animation_host()->RegisterElementAnimations(
         element_animations_state_.get());
@@ -176,13 +176,14 @@ void LayerAnimator::ResetCompositor(Compositor* compositor) {
   cc::AnimationTimeline* timeline = compositor->GetAnimationTimeline();
   DCHECK(timeline);
 
-  const int layer_id = animation_player_->element_id();
+  cc::ElementId element_id(animation_player_->element_id());
 
   // Store a reference to ElementAnimations (if any)
   // so it may be picked up in LayerAnimator::SetCompositor.
-  if (layer_id) {
+  if (element_id) {
     element_animations_state_ =
-        timeline->animation_host()->GetElementAnimationsForElementId(layer_id);
+        timeline->animation_host()->GetElementAnimationsForElementId(
+            element_id);
   }
 
   DetachLayerFromAnimationPlayer();
@@ -191,10 +192,12 @@ void LayerAnimator::ResetCompositor(Compositor* compositor) {
 }
 
 void LayerAnimator::AttachLayerToAnimationPlayer(int layer_id) {
+  // For ui, layer and element ids are equivalent.
+  cc::ElementId element_id(layer_id, 0);
   if (!animation_player_->element_id())
-    animation_player_->AttachElement(layer_id);
+    animation_player_->AttachElement(element_id);
   else
-    DCHECK_EQ(animation_player_->element_id(), layer_id);
+    DCHECK_EQ(animation_player_->element_id(), element_id);
 
   animation_player_->set_animation_delegate(this);
 }