| Index: cc/trees/property_tree_builder.cc
|
| diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc
|
| index 0149befe41ba355b77a717c54ca58ced3184bb9c..88f3284c8d10023fa305a1368820c0910a588df7 100644
|
| --- a/cc/trees/property_tree_builder.cc
|
| +++ b/cc/trees/property_tree_builder.cc
|
| @@ -148,9 +148,7 @@ bool AddTransformNodeIfNeeded(const DataForRecursion& data_from_ancestor,
|
| const bool has_significant_transform =
|
| !layer->transform().IsIdentityOr2DTranslation();
|
|
|
| - const bool has_animated_transform =
|
| - layer->layer_animation_controller()->IsAnimatingProperty(
|
| - Animation::TRANSFORM);
|
| + const bool has_animated_transform = layer->TransformIsAnimating();
|
|
|
| const bool has_surface = !!layer->render_surface();
|
|
|
| @@ -281,9 +279,7 @@ void AddOpacityNodeIfNeeded(const DataForRecursion& data_from_ancestor,
|
| const bool is_root = !layer->parent();
|
| const bool has_transparency = layer->opacity() != 1.f;
|
| const bool has_animated_opacity =
|
| - layer->layer_animation_controller()->IsAnimatingProperty(
|
| - Animation::OPACITY) ||
|
| - layer->OpacityCanAnimateOnImplThread();
|
| + layer->OpacityIsAnimating() || layer->OpacityCanAnimateOnImplThread();
|
| bool requires_node = is_root || has_transparency || has_animated_opacity;
|
|
|
| int parent_id = data_from_ancestor.opacity_tree_parent;
|
|
|