CC Animations: Redirect all compositor animation requests to AnimationHost.

cc/trees/layer_tree_host_common.cc

 // Copyright 2011 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_common.h"
 
 #include <algorithm>
 
 #include "base/trace_event/trace_event.h"
 #include "cc/base/math_util.h"
@@ skipping 946 matching lines @@
     *combined_maximum_animation_contents_scale = 0.f;
     *combined_starting_animation_contents_scale = 0.f;
     *combined_is_animating_scale = true;
     return;
   }
 
   // We currently only support computing maximum scale for combinations of
   // scales and translations. We treat all non-translations as potentially
   // affecting scale. Animations that include non-translation/scale components
   // will cause the computation of MaximumScale below to fail.
-  bool layer_is_animating_scale =
-      !layer->layer_animation_controller()->HasOnlyTranslationTransforms();
+  bool layer_is_animating_scale = !layer->HasOnlyTranslationTransforms();
 
   if (!layer_is_animating_scale && !ancestor_is_animating_scale) {
     *combined_maximum_animation_contents_scale = 0.f;
     *combined_starting_animation_contents_scale = 0.f;
     *combined_is_animating_scale = false;
     return;
   }
 
   // We don't attempt to accumulate animation scale from multiple nodes,
   // because of the risk of significant overestimation. For example, one node
@@ skipping 16 matching lines @@
     *combined_maximum_animation_contents_scale =
         ancestor_maximum_animation_contents_scale *
         std::max(layer_transform_scales.x(), layer_transform_scales.y());
     *combined_starting_animation_contents_scale =
         *combined_maximum_animation_contents_scale;
     return;
   }
 
   float layer_maximum_animated_scale = 0.f;
   float layer_start_animated_scale = 0.f;
-  if (!layer->layer_animation_controller()->MaximumTargetScale(
-          &layer_maximum_animated_scale)) {
+  if (!layer->MaximumTargetScale(&layer_maximum_animated_scale)) {
     *combined_maximum_animation_contents_scale = 0.f;
     return;
   }
-  if (!layer->layer_animation_controller()->AnimationStartScale(
-          &layer_start_animated_scale)) {
+  if (!layer->AnimationStartScale(&layer_start_animated_scale)) {
     *combined_starting_animation_contents_scale = 0.f;
     return;
   }
 
   gfx::Vector2dF ancestor_transform_scales =
       MathUtil::ComputeTransform2dScaleComponents(ancestor_transform, 0.f);
   float max_scale_xy =
       std::max(ancestor_transform_scales.x(), ancestor_transform_scales.y());
   *combined_maximum_animation_contents_scale =
       layer_maximum_animated_scale * max_scale_xy;
@@ skipping 1620 matching lines @@
 
 PropertyTrees* GetPropertyTrees(Layer* layer) {
   return layer->layer_tree_host()->property_trees();
 }
 
 PropertyTrees* GetPropertyTrees(LayerImpl* layer) {
   return layer->layer_tree_impl()->property_trees();
 }
 
 }  // namespace cc