CC Animations: Redirect all compositor animation requests to AnimationHost.

cc/trees/property_tree_builder.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 "cc/trees/property_tree_builder.h"
 
 #include <map>
 #include <set>
 
 #include "cc/base/math_util.h"
@@ skipping 45 matching lines @@
 template <typename LayerType>
 static ClipNode* GetClipParent(const DataForRecursion<LayerType>& data,
                                LayerType* layer) {
   const bool inherits_clip = !layer->parent() || !layer->clip_parent();
   const int id = inherits_clip ? data.clip_tree_parent
                                : layer->clip_parent()->clip_tree_index();
   return data.clip_tree->Node(id);
 }
 
 template <typename LayerType>
-static bool HasPotentiallyRunningAnimation(LayerType* layer,
-                                           Animation::TargetProperty property) {
-  if (Animation* animation =
-          layer->layer_animation_controller()->GetAnimation(property)) {
-    return !animation->is_finished();
-  }
-  return false;
-}
-
-template <typename LayerType>
 static bool RequiresClipNode(LayerType* layer,
                              const DataForRecursion<LayerType>& data,
                              int parent_transform_id,
                              bool is_clipped) {
   const bool render_surface_applies_clip =
       layer->render_surface() && is_clipped;
   const bool render_surface_may_grow_due_to_clip_children =
       layer->render_surface() && layer->num_unclipped_descendants() > 0;
 
   if (layer->masks_to_bounds() || layer->mask_layer() ||
@@ skipping 81 matching lines @@
     DataForRecursion<LayerType>* data_for_children) {
   const bool is_root = !layer->parent();
   const bool is_page_scale_layer = layer == data_from_ancestor.page_scale_layer;
   const bool is_scrollable = layer->scrollable();
   const bool is_fixed = layer->position_constraint().is_fixed_position();
 
   const bool has_significant_transform =
       !layer->transform().IsIdentityOr2DTranslation();
 
   const bool has_potentially_animated_transform =
-      HasPotentiallyRunningAnimation(layer, Animation::TRANSFORM);
-
-  const bool has_animated_transform =
-      layer->layer_animation_controller()->IsAnimatingProperty(
-          Animation::TRANSFORM);
+      layer->HasPotentiallyRunningTransformAnimation();
+  const bool has_animated_transform = layer->TransformIsAnimating();
 
   const bool has_surface = !!layer->render_surface();
 
   bool requires_node = is_root || is_scrollable || has_significant_transform ||
                        has_potentially_animated_transform || has_surface ||
                        is_fixed || is_page_scale_layer;
 
   LayerType* transform_parent = GetTransformParent(data_from_ancestor, layer);
   DCHECK_IMPLIES(!is_root, transform_parent);
 
@@ skipping 144 matching lines @@
 
   data_for_children->scroll_compensation_adjustment +=
       layer->ScrollCompensationAdjustment() - node->data.scroll_snap;
 
   node->owner_id = layer->id();
 
   return true;
 }
 
 bool IsAnimatingOpacity(Layer* layer) {
-  return HasPotentiallyRunningAnimation(layer, Animation::OPACITY) ||
+  return layer->HasPotentiallyRunningOpacityAnimation() ||
          layer->OpacityCanAnimateOnImplThread();
 }
 
 bool IsAnimatingOpacity(LayerImpl* layer) {
-  return HasPotentiallyRunningAnimation(layer, Animation::OPACITY);
+  return layer->HasPotentiallyRunningOpacityAnimation();
 }
 
 template <typename LayerType>
 void AddOpacityNodeIfNeeded(
     const DataForRecursion<LayerType>& data_from_ancestor,
     LayerType* layer,
     DataForRecursion<LayerType>* data_for_children) {
   const bool is_root = !layer->parent();
   const bool has_transparency = layer->opacity() != 1.f;
   const bool has_animated_opacity = IsAnimatingOpacity(layer);
@@ skipping 148 matching lines @@
     const gfx::Rect& viewport,
     const gfx::Transform& device_transform,
     PropertyTrees* property_trees) {
   BuildPropertyTreesTopLevelInternal(
       root_layer, page_scale_layer, inner_viewport_scroll_layer,
       outer_viewport_scroll_layer, page_scale_factor, device_scale_factor,
       viewport, device_transform, property_trees);
 }
 
 }  // namespace cc