Refactor MutatorHostClient from LayerTreeHost to LayerTree.

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 26 matching lines @@
         player_id_(AnimationIdProvider::NextPlayerId()),
         player_child_id_(AnimationIdProvider::NextPlayerId()) {
     timeline_ = AnimationTimeline::Create(timeline_id_);
     player_ = AnimationPlayer::Create(player_id_);
     player_child_ = AnimationPlayer::Create(player_child_id_);
 
     player_->set_animation_delegate(this);
   }
 
   void AttachPlayersToTimeline() {
-    layer_tree_host()->animation_host()->AddAnimationTimeline(timeline_.get());
-    layer_tree_host()->SetElementIdsForTesting();
+    layer_tree()->animation_host()->AddAnimationTimeline(timeline_.get());
+    layer_tree()->SetElementIdsForTesting();
     timeline_->AttachPlayer(player_.get());
     timeline_->AttachPlayer(player_child_.get());
   }
 
  protected:
   scoped_refptr<AnimationTimeline> timeline_;
   scoped_refptr<AnimationPlayer> player_;
   scoped_refptr<AnimationPlayer> player_child_;
 
   const int timeline_id_;
@@ skipping 720 matching lines @@
     // Allows NotifyAnimationTakeover to get called.
     player_child_->set_animation_delegate(this);
   }
 
   void BeginTest() override { PostSetNeedsCommitToMainThread(); }
 
   void DidCommit() override {
     if (layer_tree_host()->source_frame_number() == 1) {
       // Add an update after the first commit to trigger the animation takeover
       // path.
-      layer_tree_host()
+      layer_tree()
           ->animation_host()
           ->scroll_offset_animations()
           .AddTakeoverUpdate(scroll_layer_->element_id());
-      EXPECT_TRUE(layer_tree_host()
+      EXPECT_TRUE(layer_tree()
                       ->animation_host()
                       ->scroll_offset_animations()
                       .HasUpdatesForTesting());
     }
   }
 
   void WillCommitCompleteOnThread(LayerTreeHostImpl* host_impl) override {
     if (host_impl->sync_tree()->source_frame_number() == 0) {
       host_impl->animation_host()->ImplOnlyScrollAnimationCreate(
           scroll_layer_->element_id(), gfx::ScrollOffset(650.f, 750.f),
@@ skipping 36 matching lines @@
     AttachPlayersToTimeline();
     player_child_->AttachElement(scroll_layer_->element_id());
   }
 
   void BeginTest() override { PostSetNeedsCommitToMainThread(); }
 
   void DidCommit() override {
     if (layer_tree_host()->source_frame_number() == 1) {
       // Add an update after the first commit to trigger the animation update
       // path.
-      layer_tree_host()
+      layer_tree()
           ->animation_host()
           ->scroll_offset_animations()
           .AddAdjustmentUpdate(scroll_layer_->element_id(),
                                gfx::Vector2dF(100.f, 100.f));
-      EXPECT_TRUE(layer_tree_host()
+      EXPECT_TRUE(layer_tree()
                       ->animation_host()
                       ->scroll_offset_animations()
                       .HasUpdatesForTesting());
     } else if (layer_tree_host()->source_frame_number() == 2) {
       // Verify that the update queue is cleared after the update is applied.
-      EXPECT_FALSE(layer_tree_host()
+      EXPECT_FALSE(layer_tree()
                        ->animation_host()
                        ->scroll_offset_animations()
                        .HasUpdatesForTesting());
     }
   }
 
   void BeginCommitOnThread(LayerTreeHostImpl* host_impl) override {
     // Note that the frame number gets incremented after BeginCommitOnThread but
     // before WillCommitCompleteOnThread and CommitCompleteOnThread.
     if (host_impl->sync_tree()->source_frame_number() == 0) {
@@ skipping 190 matching lines @@
   void DidCommit() override {
     if (layer_tree_host()->source_frame_number() == 1) {
       player_->AttachElement(layer_tree_host()->root_layer()->element_id());
       AddAnimatedTransformToPlayer(player_.get(), 4, 1, 1);
     } else if (layer_tree_host()->source_frame_number() == 2) {
       AddOpacityTransitionToPlayer(player_.get(), 1, 0.f, 0.5f, true);
 
       scoped_refptr<Layer> layer = Layer::Create();
       layer_tree_host()->root_layer()->AddChild(layer);
 
-      layer_tree_host()->SetElementIdsForTesting();
+      layer_tree()->SetElementIdsForTesting();
       layer->SetBounds(gfx::Size(4, 4));
 
       player_child_->AttachElement(layer->element_id());
       player_child_->set_animation_delegate(this);
       AddOpacityTransitionToPlayer(player_child_.get(), 1, 0.f, 0.5f, true);
     }
   }
 
   void BeginCommitOnThread(LayerTreeHostImpl* host_impl) override {
     host_impl->BlockNotifyReadyToActivateForTesting(true);
@@ skipping 70 matching lines @@
 
     layer_ = FakePictureLayer::Create(&client_);
     layer_->SetBounds(gfx::Size(2, 2));
     client_.set_bounds(layer_->bounds());
     // Transform the layer to 4,4 to start.
     gfx::Transform start_transform;
     start_transform.Translate(4.0, 4.0);
     layer_->SetTransform(start_transform);
 
     layer_tree_host()->root_layer()->AddChild(layer_);
-    layer_tree_host()->SetElementIdsForTesting();
+    layer_tree()->SetElementIdsForTesting();
 
     player_->AttachElement(layer_->element_id());
 
     AttachPlayersToTimeline();
   }
 
   void BeginTest() override {
     // Add a translate from 6,7 to 8,9.
     TransformOperations start;
     start.AppendTranslate(6.f, 7.f, 0.f);
@@ skipping 51 matching lines @@
 // the animation should resume.
 class LayerTreeHostAnimationTestAnimatedLayerRemovedAndAdded
     : public LayerTreeHostAnimationTest {
  public:
   void SetupTree() override {
     LayerTreeHostAnimationTest::SetupTree();
     layer_ = Layer::Create();
     layer_->SetBounds(gfx::Size(4, 4));
     layer_tree_host()->root_layer()->AddChild(layer_);
 
-    layer_tree_host()->SetElementIdsForTesting();
+    layer_tree()->SetElementIdsForTesting();
 
-    layer_tree_host()->animation_host()->AddAnimationTimeline(timeline_.get());
+    layer_tree()->animation_host()->AddAnimationTimeline(timeline_.get());
     timeline_->AttachPlayer(player_.get());
     player_->AttachElement(layer_->element_id());
     DCHECK(player_->element_animations());
 
     AddOpacityTransitionToPlayer(player_.get(), 10000.0, 0.1f, 0.9f, true);
   }
 
   void BeginTest() override { PostSetNeedsCommitToMainThread(); }
 
   void DidCommit() override {
     switch (layer_tree_host()->source_frame_number()) {
       case 0:
         EXPECT_TRUE(
             player_->element_animations()->has_element_in_active_list());
         EXPECT_FALSE(
             player_->element_animations()->has_element_in_pending_list());
-        EXPECT_TRUE(layer_tree_host()->animation_host()->NeedsAnimateLayers());
+        EXPECT_TRUE(layer_tree()->animation_host()->NeedsAnimateLayers());
         break;
       case 1:
         layer_->RemoveFromParent();
         EXPECT_FALSE(
             player_->element_animations()->has_element_in_active_list());
         EXPECT_FALSE(
             player_->element_animations()->has_element_in_pending_list());
-        EXPECT_FALSE(layer_tree_host()->animation_host()->NeedsAnimateLayers());
+        EXPECT_FALSE(layer_tree()->animation_host()->NeedsAnimateLayers());
         break;
       case 2:
         layer_tree_host()->root_layer()->AddChild(layer_);
         EXPECT_TRUE(
             player_->element_animations()->has_element_in_active_list());
         EXPECT_FALSE(
             player_->element_animations()->has_element_in_pending_list());
-        EXPECT_TRUE(layer_tree_host()->animation_host()->NeedsAnimateLayers());
+        EXPECT_TRUE(layer_tree()->animation_host()->NeedsAnimateLayers());
         break;
     }
   }
 
   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_);
 
@@ skipping 576 matching lines @@
  private:
   scoped_refptr<Layer> layer_;
   FakeContentLayerClient client_;
 };
 
 MULTI_THREAD_TEST_F(
     LayerTreeHostAnimationTestRebuildPropertyTreesOnAnimationSetNeedsCommit);
 
 }  // namespace
 }  // namespace cc