| Index: cc/layers/layer_utils.cc
|
| diff --git a/cc/layers/layer_utils.cc b/cc/layers/layer_utils.cc
|
| index 0eeab138ce75496236405c55faad29c2a894f750..b3b6d53c5599afa3bfe0eba2fb2b580e103f3d51 100644
|
| --- a/cc/layers/layer_utils.cc
|
| +++ b/cc/layers/layer_utils.cc
|
| @@ -7,6 +7,7 @@
|
| #include "cc/layers/layer_impl.h"
|
| #include "cc/trees/layer_tree_host_common.h"
|
| #include "cc/trees/layer_tree_impl.h"
|
| +#include "cc/trees/transform_node.h"
|
| #include "ui/gfx/geometry/box_f.h"
|
|
|
| namespace cc {
|
| @@ -18,7 +19,7 @@ bool HasTransformAnimationThatInflatesBounds(const LayerImpl& layer) {
|
| }
|
|
|
| inline bool HasAncestorTransformAnimation(const TransformNode* transform_node) {
|
| - return transform_node->data.to_screen_is_potentially_animated;
|
| + return transform_node->to_screen_is_potentially_animated;
|
| }
|
|
|
| inline bool HasAncestorFilterAnimation(const LayerImpl& layer) {
|
| @@ -92,7 +93,7 @@ bool LayerUtils::GetAnimationBounds(const LayerImpl& layer_in, gfx::BoxF* out) {
|
| // HasAncestorFilterAnimation() for reference.
|
|
|
| if (HasTransformAnimationThatInflatesBounds(*layer)) {
|
| - coalesced_transform.ConcatTransform(transform_node->data.pre_local);
|
| + coalesced_transform.ConcatTransform(transform_node->pre_local);
|
| coalesced_transform.TransformBox(&box);
|
| coalesced_transform.MakeIdentity();
|
|
|
| @@ -101,9 +102,9 @@ bool LayerUtils::GetAnimationBounds(const LayerImpl& layer_in, gfx::BoxF* out) {
|
| return false;
|
| box = inflated;
|
|
|
| - coalesced_transform.ConcatTransform(transform_node->data.post_local);
|
| + coalesced_transform.ConcatTransform(transform_node->post_local);
|
| } else {
|
| - coalesced_transform.ConcatTransform(transform_node->data.to_parent);
|
| + coalesced_transform.ConcatTransform(transform_node->to_parent);
|
| }
|
| }
|
|
|
|
|