CC Animation: Make layer_animation_controller a private member of ElementAnimations.

cc/animation/animation_host.cc

 // Copyright 2015 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/animation/animation_host.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 61 matching lines @@
                                    const gfx::Vector2dF& scroll_delta,
                                    const gfx::ScrollOffset& max_scroll_offset,
                                    base::TimeTicks frame_monotonic_time) {
     DCHECK(scroll_offset_animation_player_);
     if (!scroll_offset_animation_player_->element_animations())
       return false;
 
     DCHECK_EQ(layer_id, scroll_offset_animation_player_->layer_id());
 
     Animation* animation = scroll_offset_animation_player_->element_animations()
-                               ->layer_animation_controller()
                                ->GetAnimation(TargetProperty::SCROLL_OFFSET);
     if (!animation) {
       scroll_offset_animation_player_->DetachLayer();
       return false;
     }
 
     ScrollOffsetAnimationCurve* curve =
         animation->curve()->ToScrollOffsetAnimationCurve();
 
     gfx::ScrollOffset new_target =
@@ skipping 237 matching lines @@
   }
 }
 
 LayerAnimationController* AnimationHost::GetControllerForLayerId(
     int layer_id) const {
   const ElementAnimations* element_animations =
       GetElementAnimationsForLayerId(layer_id);
   if (!element_animations)
     return nullptr;
 
-  return element_animations->layer_animation_controller();
+  return element_animations->layer_animation_controller_.get();
 }
 
 ElementAnimations* AnimationHost::GetElementAnimationsForLayerId(
     int layer_id) const {
   DCHECK(layer_id);
   auto iter = layer_to_element_animations_map_.find(layer_id);
   return iter == layer_to_element_animations_map_.end() ? nullptr
                                                         : iter->second.get();
 }
 
@@ skipping 357 matching lines @@
 AnimationHost::active_animation_controllers_for_testing() const {
   return active_animation_controllers_;
 }
 
 const AnimationHost::AnimationControllerMap&
 AnimationHost::all_animation_controllers_for_testing() const {
   return all_animation_controllers_;
 }
 
 }  // namespace cc