3 files changed, 69 insertions, 1 deletions

diff --git a/ui/compositor/layer_animator.cc b/ui/compositor/layer_animator.cc
index 7960200..20d268e 100644
--- a/ui/compositor/layer_animator.cc
+++ b/ui/compositor/layer_animator.cc
@@ -10,10 +10,13 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/animation/animation_events.h"
+#include "cc/animation/animation_host.h"
 #include "cc/animation/animation_id_provider.h"
 #include "cc/animation/animation_player.h"
+#include "cc/animation/animation_registrar.h"
 #include "cc/animation/animation_timeline.h"
 #include "cc/animation/element_animations.h"
+#include "cc/animation/layer_animation_controller.h"
 #include "cc/layers/layer_settings.h"
 #include "cc/output/begin_frame_args.h"
 #include "ui/compositor/compositor.h"
@@ -135,6 +138,9 @@ void LayerAnimator::SetDelegate(LayerAnimationDelegate* delegate) {
 }
 
 void LayerAnimator::SwitchToLayer(scoped_refptr<cc::Layer> new_layer) {
+  // Release LAC state for old layer.
+  animation_controller_state_ = nullptr;
+
   if (delegate_) {
     if (animation_player_)
       DetachLayerFromAnimationPlayer();
@@ -154,16 +160,37 @@ void LayerAnimator::SetCompositor(Compositor* compositor) {
   if (animation_player_) {
     cc::AnimationTimeline* timeline = compositor->GetAnimationTimeline();
     DCHECK(timeline);
-    timeline->AttachPlayer(animation_player_);
 
     DCHECK(delegate_->GetCcLayer());
+
+    // Register LAC so ElementAnimations picks it up via
+    // AnimationRegistrar::GetAnimationControllerForId.
+    if (animation_controller_state_) {
+      DCHECK_EQ(animation_controller_state_->id(),
+                delegate_->GetCcLayer()->id());
+      timeline->animation_host()
+          ->animation_registrar()
+          ->RegisterAnimationController(animation_controller_state_.get());
+    }
+
+    timeline->AttachPlayer(animation_player_);
+
     AttachLayerToAnimationPlayer(delegate_->GetCcLayer()->id());
+
+    // Release LAC (it is referenced in ElementAnimations).
+    animation_controller_state_ = nullptr;
   }
 }
 
 void LayerAnimator::ResetCompositor(Compositor* compositor) {
   DCHECK(compositor);
   if (animation_player_) {
+    // Store a reference to LAC if any so it may be picked up in SetCompositor.
+    if (animation_player_->element_animations()) {
+      animation_controller_state_ =
+          animation_player_->element_animations()->layer_animation_controller();
+    }
+
     DetachLayerFromAnimationPlayer();
 
     cc::AnimationTimeline* timeline = compositor->GetAnimationTimeline();
diff --git a/ui/compositor/layer_animator.h b/ui/compositor/layer_animator.h
index 349fd75..48e8a1e 100644
--- a/ui/compositor/layer_animator.h
+++ b/ui/compositor/layer_animator.h
@@ -26,6 +26,7 @@ class Animation;
 class AnimationPlayer;
 class AnimationTimeline;
 class Layer;
+class LayerAnimationController;
 }
 
 namespace gfx {
@@ -391,6 +392,11 @@ class COMPOSITOR_EXPORT LayerAnimator
   // aborted.
   base::ObserverList<LayerAnimationObserver> observers_;
 
+  // We store a state of LayerAnimationController here to save it in
+  // ResetCompositor/SetCompositor scope.
+  // TODO(loyso): Remove it. crbug.com/592873.
+  scoped_refptr<cc::LayerAnimationController> animation_controller_state_;
+
   DISALLOW_COPY_AND_ASSIGN(LayerAnimator);
 };
 
diff --git a/ui/compositor/layer_animator_unittest.cc b/ui/compositor/layer_animator_unittest.cc
index f15bb4a..9c1c5f1 100644
--- a/ui/compositor/layer_animator_unittest.cc
+++ b/ui/compositor/layer_animator_unittest.cc
@@ -2532,15 +2532,50 @@ TEST(LayerAnimatorTest, LayerMovedBetweenCompositorsDuringAnimation) {
       LayerAnimationElement::CreateOpacityElement(target_opacity, time_delta)));
   EXPECT_TRUE(compositor_1->layer_animator_collection()->HasActiveAnimators());
   EXPECT_FALSE(compositor_2->layer_animator_collection()->HasActiveAnimators());
+  EXPECT_TRUE(layer.cc_layer_for_testing()->HasActiveAnimation());
 
   root_2.Add(&layer);
   EXPECT_FALSE(compositor_1->layer_animator_collection()->HasActiveAnimators());
   EXPECT_TRUE(compositor_2->layer_animator_collection()->HasActiveAnimators());
+  EXPECT_TRUE(layer.cc_layer_for_testing()->HasActiveAnimation());
+
   host_2.reset();
   host_1.reset();
   TerminateContextFactoryForTests();
 }
 
+TEST(LayerAnimatorTest, ThreadedAnimationSurvivesIfLayerRemovedAdded) {
+  bool enable_pixel_output = false;
+  ui::ContextFactory* context_factory =
+      InitializeContextFactoryForTests(enable_pixel_output);
+  const gfx::Rect bounds(10, 10, 100, 100);
+  scoped_ptr<TestCompositorHost> host(
+      TestCompositorHost::Create(bounds, context_factory));
+  host->Show();
+
+  Compositor* compositor = host->GetCompositor();
+
+  Layer root;
+  compositor->SetRootLayer(&root);
+
+  Layer layer;
+  root.Add(&layer);
+
+  LayerAnimator* animator = layer.GetAnimator();
+  double target_opacity = 1.0;
+  base::TimeDelta time_delta = base::TimeDelta::FromSeconds(1);
+  animator->ScheduleAnimation(new LayerAnimationSequence(
+      LayerAnimationElement::CreateOpacityElement(target_opacity, time_delta)));
+
+  EXPECT_TRUE(layer.cc_layer_for_testing()->HasActiveAnimation());
+  root.Remove(&layer);
+  root.Add(&layer);
+  EXPECT_TRUE(layer.cc_layer_for_testing()->HasActiveAnimation());
+
+  host.reset();
+  TerminateContextFactoryForTests();
+}
+
 class LayerOwnerAnimationObserver : public LayerAnimationObserver {
  public:
   LayerOwnerAnimationObserver(LayerAnimator* animator)