UI Compositor Animation: Remove cc::ElementAnimations state storage.

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 117 matching lines @@
   SwitchToLayer(delegate ? delegate->GetCcLayer() : nullptr);
   delegate_ = delegate;
   if (delegate_ && is_started_) {
     LayerAnimatorCollection* collection = GetLayerAnimatorCollection();
     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());
 }
 
-void LayerAnimator::SetCompositor(Compositor* compositor) {
+void LayerAnimator::AttachLayerAndTimeline(Compositor* compositor) {
+  DCHECK(compositor);
+
+  cc::AnimationTimeline* timeline = compositor->GetAnimationTimeline();
+  DCHECK(timeline);
+  timeline->AttachPlayer(animation_player_);
+
+  DCHECK(delegate_->GetCcLayer());
+  AttachLayerToAnimationPlayer(delegate_->GetCcLayer()->id());
+}
+
+void LayerAnimator::DetachLayerAndTimeline(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().primaryId,
-              delegate_->GetCcLayer()->id());
-    timeline->animation_host()->RegisterElementAnimations(
-        element_animations_state_.get());
-  }
-
-  timeline->AttachPlayer(animation_player_);
-
-  AttachLayerToAnimationPlayer(delegate_->GetCcLayer()->id());
-
-  // Release ElementAnimations state.
-  element_animations_state_ = nullptr;
-}
-
-void LayerAnimator::ResetCompositor(Compositor* compositor) {
-  DCHECK(compositor);
-
-  cc::AnimationTimeline* timeline = compositor->GetAnimationTimeline();
-  DCHECK(timeline);
-
-  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 (element_id) {
-    element_animations_state_ =
-        timeline->animation_host()->GetElementAnimationsForElementId(
-            element_id);
-  }
-
   DetachLayerFromAnimationPlayer();
-
   timeline->DetachPlayer(animation_player_);
 }
 
 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(element_id);
   else
     DCHECK_EQ(animation_player_->element_id(), element_id);
@@ skipping 762 matching lines @@
     const base::WeakPtr<LayerAnimationSequence>& sequence)
     : sequence_(sequence) {
 }
 
 LayerAnimator::RunningAnimation::RunningAnimation(
     const RunningAnimation& other) = default;
 
 LayerAnimator::RunningAnimation::~RunningAnimation() { }
 
 }  // namespace ui