cc: Clean up Layer and LayerTreeHost.

cc/trees/property_tree.cc

 // Copyright 2014 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 <stddef.h>
 
 #include <set>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event_argument.h"
+#include "cc/animation/animation_host.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/proto/property_tree.pb.h"
 #include "cc/proto/synced_property_conversions.h"
 #include "cc/trees/clip_node.h"
 #include "cc/trees/effect_node.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/property_tree.h"
 #include "cc/trees/scroll_node.h"
@@ skipping 1787 matching lines @@
       cached_data_.animation_scales[transform_node_id]
           .combined_maximum_animation_target_scale =
           max_local_scale * ancestor_maximum_target_scale;
       cached_data_.animation_scales[transform_node_id]
           .combined_starting_animation_scale =
           max_local_scale * ancestor_starting_animation_scale;
     } else {
       // TODO(sunxd): make LayerTreeImpl::MaximumTargetScale take layer id as
       // parameter.
       LayerImpl* layer_impl = layer_tree_impl->LayerById(node->owner_id);
-      layer_tree_impl->MaximumTargetScale(
-          layer_impl, &cached_data_.animation_scales[transform_node_id]
-                           .local_maximum_animation_target_scale);
-      layer_tree_impl->AnimationStartScale(
-          layer_impl, &cached_data_.animation_scales[transform_node_id]
-                           .local_starting_animation_scale);
+      layer_impl->GetAnimationHost()->MaximumTargetScale(
+          layer_impl->element_id(), layer_impl->GetElementTypeForAnimation(),
+          &cached_data_.animation_scales[transform_node_id]
+               .local_maximum_animation_target_scale);
+      layer_impl->GetAnimationHost()->AnimationStartScale(
+          layer_impl->element_id(), layer_impl->GetElementTypeForAnimation(),
+          &cached_data_.animation_scales[transform_node_id]
+               .local_starting_animation_scale);
       gfx::Vector2dF local_scales =
           MathUtil::ComputeTransform2dScaleComponents(node->local, 0.f);
       float max_local_scale = std::max(local_scales.x(), local_scales.y());
 
       if (cached_data_.animation_scales[transform_node_id]
                   .local_starting_animation_scale == 0.f ||
           cached_data_.animation_scales[transform_node_id]
                   .local_maximum_animation_target_scale == 0.f) {
         cached_data_.animation_scales[transform_node_id]
             .combined_maximum_animation_target_scale =
@@ skipping 45 matching lines @@
   cached_data_.property_tree_update_number = 0;
   cached_data_.animation_scales = std::vector<AnimationScaleData>(
       transform_tree.nodes().size(), AnimationScaleData());
 }
 
 void PropertyTrees::UpdateCachedNumber() {
   cached_data_.property_tree_update_number++;
 }
 
 }  // namespace cc