CC Animation: Use ElementId to attach CC animation players.

ui/compositor/layer_animator.cc

 // 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.
 
 #include "ui/compositor/layer_animator.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 121 matching lines @@
     if (collection)
       collection->StartAnimator(this);
   }
 }
 
 void LayerAnimator::SwitchToLayer(scoped_refptr<cc::Layer> new_layer) {
   // Release ElementAnimations state for old layer.
   element_animations_state_ = nullptr;
 
   if (delegate_)
-    DetachLayerFromAnimationPlayer();
-  if (new_layer)
-    AttachLayerToAnimationPlayer(new_layer->id());
+    DetachElementFromAnimationPlayer();
+  if (new_layer) {
+    if (!new_layer->element_id())
+      new_layer->SetElementId(Layer::NextElementId());
+    AttachElementToAnimationPlayer(new_layer->element_id());
+  }
 }
 
 void LayerAnimator::SetCompositor(Compositor* compositor) {
   DCHECK(compositor);
 
   cc::AnimationTimeline* timeline = compositor->GetAnimationTimeline();
   DCHECK(timeline);
 
   DCHECK(delegate_->GetCcLayer());
 
   // Register ElementAnimations so it will be picked up by
   // AnimationHost::RegisterPlayerForLayer via
   // AnimationHost::GetElementAnimationsForLayerId.
   if (element_animations_state_) {
     DCHECK_EQ(element_animations_state_->element_id(),
-              delegate_->GetCcLayer()->id());
+              delegate_->GetCcLayer()->element_id());
     timeline->animation_host()->RegisterElementAnimations(
         element_animations_state_.get());
   }
 
   timeline->AttachPlayer(animation_player_);
 
-  AttachLayerToAnimationPlayer(delegate_->GetCcLayer()->id());
+  AttachElementToAnimationPlayer(delegate_->GetCcLayer()->element_id());
 
   // Release ElementAnimations state.
   element_animations_state_ = nullptr;
 }
 
 void LayerAnimator::ResetCompositor(Compositor* compositor) {
   DCHECK(compositor);
 
   cc::AnimationTimeline* timeline = compositor->GetAnimationTimeline();
   DCHECK(timeline);
 
-  const int layer_id = animation_player_->element_id();
+  const 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();
+  DetachElementFromAnimationPlayer();
 
   timeline->DetachPlayer(animation_player_);
 }
 
-void LayerAnimator::AttachLayerToAnimationPlayer(int layer_id) {
+void LayerAnimator::AttachElementToAnimationPlayer(cc::ElementId element_id) {
+  DCHECK(element_id);
+
   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);
 }
 
-void LayerAnimator::DetachLayerFromAnimationPlayer() {
+void LayerAnimator::DetachElementFromAnimationPlayer() {
   animation_player_->set_animation_delegate(nullptr);
 
   if (animation_player_->element_id())
     animation_player_->DetachElement();
 }
 
 void LayerAnimator::AddThreadedAnimation(
     std::unique_ptr<cc::Animation> animation) {
   animation_player_->AddAnimation(std::move(animation));
 }
@@ skipping 751 matching lines @@
     const base::WeakPtr<LayerAnimationSequence>& sequence)
     : sequence_(sequence) {
 }
 
 LayerAnimator::RunningAnimation::RunningAnimation(
     const RunningAnimation& other) = default;
 
 LayerAnimator::RunningAnimation::~RunningAnimation() { }
 
 }  // namespace ui