CC Animation: Make layer_animation_controller a private member of ElementAnimations.

cc/trees/layer_tree_host_unittest_animation.cc

 // Copyright 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 "cc/trees/layer_tree_host.h"
 
 #include <stdint.h>
 
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/animation_host.h"
@@ skipping 142 matching lines @@
                             bool has_unfinished_animation) override {
     EXPECT_FALSE(has_unfinished_animation);
     update_animation_state_was_called_ = true;
   }
 
   void NotifyAnimationStarted(base::TimeTicks monotonic_time,
                               TargetProperty::Type target_property,
                               int group) override {
     EXPECT_LT(base::TimeTicks(), monotonic_time);
 
-    LayerAnimationController* controller =
-        player_->element_animations()->layer_animation_controller();
-    Animation* animation = controller->GetAnimation(TargetProperty::OPACITY);
+    Animation* animation =
+        player_->element_animations()->GetAnimation(TargetProperty::OPACITY);
     if (animation)
       player_->RemoveAnimation(animation->id());
 
     EndTest();
   }
 
   void AfterTest() override { EXPECT_TRUE(update_animation_state_was_called_); }
 
  private:
   bool update_animation_state_was_called_;
@@ skipping 111 matching lines @@
 
     // Wait for the commit with the animation to happen.
     if (host_impl->sync_tree()->source_frame_number() != 0)
       return;
 
     scoped_refptr<AnimationTimeline> timeline_impl =
         host_impl->animation_host()->GetTimelineById(timeline_id_);
     scoped_refptr<AnimationPlayer> player_child_impl =
         timeline_impl->GetPlayerById(player_child_id_);
 
-    LayerAnimationController* controller_impl =
-        player_child_impl->element_animations()->layer_animation_controller();
     Animation* animation =
-        controller_impl->GetAnimation(TargetProperty::OPACITY);
+        player_child_impl->element_animations()->GetAnimation(
+            TargetProperty::OPACITY);
 
     const FloatAnimationCurve* curve =
         animation->curve()->ToFloatAnimationCurve();
     float start_opacity = curve->GetValue(base::TimeDelta());
     float end_opacity = curve->GetValue(curve->Duration());
     float linearly_interpolated_opacity =
         0.25f * end_opacity + 0.75f * start_opacity;
     base::TimeDelta time = TimeUtil::Scale(curve->Duration(), 0.25f);
     // If the linear timing function associated with this animation was not
     // picked up, then the linearly interpolated opacity would be different
@@ skipping 30 matching lines @@
     player_child_->AttachLayer(picture_->id());
   }
 
   void BeginTest() override {
     PostAddAnimationToMainThreadPlayer(player_child_.get());
   }
 
   void NotifyAnimationStarted(base::TimeTicks monotonic_time,
                               TargetProperty::Type target_property,
                               int group) override {
-    LayerAnimationController* controller =
-        player_child_->element_animations()->layer_animation_controller();
-    Animation* animation = controller->GetAnimation(TargetProperty::OPACITY);
+    Animation* animation = player_child_->element_animations()->GetAnimation(
+        TargetProperty::OPACITY);
     main_start_time_ = animation->start_time();
-    controller->RemoveAnimation(animation->id());
+    player_child_->element_animations()->RemoveAnimation(animation->id());
     EndTest();
   }
 
   void UpdateAnimationState(LayerTreeHostImpl* impl_host,
                             bool has_unfinished_animation) override {
     scoped_refptr<AnimationTimeline> timeline_impl =
         impl_host->animation_host()->GetTimelineById(timeline_id_);
     scoped_refptr<AnimationPlayer> player_child_impl =
         timeline_impl->GetPlayerById(player_child_id_);
 
-    LayerAnimationController* controller =
-        player_child_impl->element_animations()->layer_animation_controller();
-    Animation* animation = controller->GetAnimation(TargetProperty::OPACITY);
+    Animation* animation =
+        player_child_impl->element_animations()->GetAnimation(
+            TargetProperty::OPACITY);
     if (!animation)
       return;
 
     impl_start_time_ = animation->start_time();
   }
 
   void AfterTest() override {
     EXPECT_EQ(impl_start_time_, main_start_time_);
     EXPECT_LT(base::TimeTicks(), impl_start_time_);
   }
@@ skipping 14 matching lines @@
  public:
   void BeginTest() override {
     AttachPlayersToTimeline();
     player_->AttachLayer(layer_tree_host()->root_layer()->id());
     PostAddInstantAnimationToMainThreadPlayer(player_.get());
   }
 
   void NotifyAnimationFinished(base::TimeTicks monotonic_time,
                                TargetProperty::Type target_property,
                                int group) override {
-    LayerAnimationController* controller =
-        player_->element_animations()->layer_animation_controller();
-    Animation* animation = controller->GetAnimation(TargetProperty::OPACITY);
+    Animation* animation =
+        player_->element_animations()->GetAnimation(TargetProperty::OPACITY);
     if (animation)
-      controller->RemoveAnimation(animation->id());
+      player_->element_animations()->RemoveAnimation(animation->id());
     EndTest();
   }
 
   void AfterTest() override {}
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostAnimationTestAnimationFinishedEvents);
 
 // Ensures that when opacity is being animated, this value does not cause the
@@ skipping 18 matching lines @@
   void BeginTest() override {
     PostAddAnimationToMainThreadPlayer(player_.get());
   }
 
   void DidActivateTreeOnThread(LayerTreeHostImpl* host_impl) override {
     scoped_refptr<AnimationTimeline> timeline_impl =
         host_impl->animation_host()->GetTimelineById(timeline_id_);
     scoped_refptr<AnimationPlayer> player_impl =
         timeline_impl->GetPlayerById(player_id_);
 
-    LayerAnimationController* controller_impl =
-        player_impl->element_animations()->layer_animation_controller();
-    Animation* animation_impl =
-        controller_impl->GetAnimation(TargetProperty::OPACITY);
-    controller_impl->RemoveAnimation(animation_impl->id());
+    Animation* animation_impl = player_impl->element_animations()->GetAnimation(
+        TargetProperty::OPACITY);
+    player_impl->element_animations()->RemoveAnimation(animation_impl->id());
     EndTest();
   }
 
   void AfterTest() override {
     // Update() should have been called once, proving that the layer was not
     // skipped.
     EXPECT_EQ(1, update_check_layer_->update_count());
 
     // clear update_check_layer_ so LayerTreeHost dies.
     update_check_layer_ = NULL;
@@ skipping 333 matching lines @@
 
   void BeginTest() override { PostSetNeedsCommitToMainThread(); }
 
   void BeginMainFrame(const BeginFrameArgs& args) override {
     switch (layer_tree_host()->source_frame_number()) {
       case 0:
         break;
       case 1: {
         Animation* animation =
             player_child_->element_animations()
-                ->layer_animation_controller()
                 ->GetAnimation(TargetProperty::SCROLL_OFFSET);
         player_child_->RemoveAnimation(animation->id());
         scroll_layer_->SetScrollOffset(final_postion_);
         break;
       }
       default:
         EXPECT_EQ(final_postion_, scroll_layer_->scroll_offset());
     }
   }
 
@@ skipping 12 matching lines @@
     }
 
     scoped_refptr<AnimationTimeline> timeline_impl =
         host_impl->animation_host()->GetTimelineById(timeline_id_);
     scoped_refptr<AnimationPlayer> player_impl =
         timeline_impl->GetPlayerById(player_child_id_);
 
     LayerImpl* scroll_layer_impl =
         host_impl->active_tree()->root_layer()->children()[0];
     Animation* animation = player_impl->element_animations()
-                               ->layer_animation_controller()
                                ->GetAnimation(TargetProperty::SCROLL_OFFSET);
 
     if (!animation || animation->run_state() != Animation::RUNNING) {
       host_impl->BlockNotifyReadyToActivateForTesting(false);
       return;
     }
 
     // Block activation until the running animation has a chance to produce a
     // scroll delta.
     gfx::Vector2dF scroll_delta = ScrollDelta(scroll_layer_impl);
@@ skipping 95 matching lines @@
         host_impl->animation_host()->GetTimelineById(timeline_id_);
     scoped_refptr<AnimationPlayer> player_impl =
         timeline_impl->GetPlayerById(player_id_);
     scoped_refptr<AnimationPlayer> player_child_impl =
         timeline_impl->GetPlayerById(player_child_id_);
 
     // wait for tree activation.
     if (!player_impl->element_animations())
       return;
 
-    LayerAnimationController* root_controller_impl =
-        player_impl->element_animations()->layer_animation_controller();
-    Animation* root_animation =
-        root_controller_impl->GetAnimation(TargetProperty::OPACITY);
+    Animation* root_animation = player_impl->element_animations()->GetAnimation(
+        TargetProperty::OPACITY);
     if (!root_animation || root_animation->run_state() != Animation::RUNNING)
       return;
 
-    LayerAnimationController* child_controller_impl =
-        player_child_impl->element_animations()->layer_animation_controller();
     Animation* child_animation =
-        child_controller_impl->GetAnimation(TargetProperty::OPACITY);
+        player_child_impl->element_animations()->GetAnimation(
+            TargetProperty::OPACITY);
     EXPECT_EQ(Animation::RUNNING, child_animation->run_state());
     EXPECT_EQ(root_animation->start_time(), child_animation->start_time());
-    root_controller_impl->AbortAnimations(TargetProperty::OPACITY);
-    root_controller_impl->AbortAnimations(TargetProperty::TRANSFORM);
-    child_controller_impl->AbortAnimations(TargetProperty::OPACITY);
+    player_impl->element_animations()->AbortAnimations(TargetProperty::OPACITY);
+    player_impl->element_animations()->AbortAnimations(
+        TargetProperty::TRANSFORM);
+    player_child_impl->element_animations()->AbortAnimations(
+        TargetProperty::OPACITY);
     EndTest();
   }
 
   void AfterTest() override {}
 
  private:
   int frame_count_with_pending_tree_;
 };
 
 // This test blocks activation which is not supported for single thread mode.
@@ skipping 38 matching lines @@
     // After checking this on the sync tree, we will activate, which will cause
     // PrepareTiles to happen again (which races with the test exiting).
     if (TestEnded())
       return;
 
     scoped_refptr<AnimationTimeline> timeline_impl =
         host_impl->animation_host()->GetTimelineById(timeline_id_);
     scoped_refptr<AnimationPlayer> player_impl =
         timeline_impl->GetPlayerById(player_id_);
 
-    LayerAnimationController* controller_impl =
-        player_impl->element_animations()->layer_animation_controller();
-
     LayerImpl* root = host_impl->sync_tree()->root_layer();
     LayerImpl* child = root->children()[0];
-    Animation* animation =
-        controller_impl->GetAnimation(TargetProperty::TRANSFORM);
+    Animation* animation = player_impl->element_animations()->GetAnimation(
+        TargetProperty::TRANSFORM);
 
     // The animation should be starting for the first frame.
     EXPECT_EQ(Animation::STARTING, animation->run_state());
 
     // And the transform should be propogated to the sync tree layer, at its
     // starting state which is 6,7.
     gfx::Transform expected_transform;
     expected_transform.Translate(6.0, 7.0);
     EXPECT_EQ(expected_transform, child->DrawTransform());
     // And the sync tree layer should know it is animating.
     EXPECT_TRUE(child->screen_space_transform_is_animating());
 
-    controller_impl->AbortAnimations(TargetProperty::TRANSFORM);
+    player_impl->element_animations()->AbortAnimations(
+        TargetProperty::TRANSFORM);
     EndTest();
   }
 
   void AfterTest() override {}
 
   FakeContentLayerClient client_;
   scoped_refptr<Layer> layer_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
@@ skipping 161 matching lines @@
   }
 
   void BeginTest() override { PostSetNeedsCommitToMainThread(); }
 
   void DidCommit() override {
     switch (layer_tree_host()->source_frame_number()) {
       case 1:
         AddAnimatedTransformToPlayer(player_child_.get(), 1.0, 5, 5);
         break;
       case 2:
-        LayerAnimationController* controller =
-            player_child_->element_animations()->layer_animation_controller();
         Animation* animation =
-            controller->GetAnimation(TargetProperty::TRANSFORM);
+            player_child_->element_animations()->GetAnimation(
+                TargetProperty::TRANSFORM);
         player_child_->RemoveAnimation(animation->id());
         gfx::Transform transform;
         transform.Translate(10.f, 10.f);
         layer_->SetTransform(transform);
 
         // Do something that causes property trees to get rebuilt. This is
         // intended to simulate the conditions that caused the bug whose fix
         // this is testing (the test will pass without it but won't test what
         // we want it to). We were updating the wrong transform node at the end
         // of an animation (we were assuming the layer with the finished
@@ skipping 56 matching lines @@
   }
 
   void BeginTest() override { PostSetNeedsCommitToMainThread(); }
 
   void DidCommit() override {
     switch (layer_tree_host()->source_frame_number()) {
       case 1:
         AddAnimatedTransformToPlayer(player_.get(), 1.0, 5, 5);
         break;
       case 2:
-        LayerAnimationController* controller =
-            player_->element_animations()->layer_animation_controller();
-        Animation* animation =
-            controller->GetAnimation(TargetProperty::TRANSFORM);
+        Animation* animation = player_->element_animations()->GetAnimation(
+            TargetProperty::TRANSFORM);
         player_->RemoveAnimation(animation->id());
         break;
     }
   }
 
   void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) override {
     LayerImpl* root = host_impl->sync_tree()->root_layer();
     LayerImpl* child = root->children()[0];
     switch (host_impl->sync_tree()->source_frame_number()) {
       case 0:
@@ skipping 298 matching lines @@
  private:
   scoped_refptr<Layer> layer_;
   FakeContentLayerClient client_;
 };
 
 MULTI_THREAD_TEST_F(
     LayerTreeHostAnimationTestRebuildPropertyTreesOnAnimationSetNeedsCommit);
 
 }  // namespace
 }  // namespace cc