| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/layers/layer_utils.h" | 5 #include "cc/layers/layer_utils.h" |
| 6 | 6 |
| 7 #include "cc/layers/layer_impl.h" | 7 #include "cc/layers/layer_impl.h" |
| 8 #include "cc/trees/layer_tree_host_common.h" | 8 #include "cc/trees/layer_tree_host_common.h" |
| 9 #include "cc/trees/layer_tree_impl.h" | 9 #include "cc/trees/layer_tree_impl.h" |
| 10 #include "ui/gfx/geometry/box_f.h" | 10 #include "ui/gfx/geometry/box_f.h" |
| 11 | 11 |
| 12 namespace cc { | 12 namespace cc { |
| 13 | 13 |
| 14 namespace { | 14 namespace { |
| 15 | 15 |
| 16 bool HasTransformAnimationThatInflatesBounds(const LayerImpl& layer) { | 16 bool HasTransformAnimationThatInflatesBounds(const LayerImpl& layer) { |
| 17 return layer.HasTransformAnimationThatInflatesBounds(); | 17 return layer.HasTransformAnimationThatInflatesBounds(); |
| 18 } | 18 } |
| 19 | 19 |
| 20 inline bool HasAncestorTransformAnimation(const TransformNode* transform_node) { | 20 inline bool HasAncestorTransformAnimation(const TransformNode* transform_node) { |
| 21 return transform_node->data.to_screen_is_animated; | 21 return transform_node->data.to_screen_is_potentially_animated; |
| 22 } | 22 } |
| 23 | 23 |
| 24 inline bool HasAncestorFilterAnimation(const LayerImpl& layer) { | 24 inline bool HasAncestorFilterAnimation(const LayerImpl& layer) { |
| 25 // This function returns false, it should use the effect tree once filters | 25 // This function returns false, it should use the effect tree once filters |
| 26 // and filter animations are known by the tree. | 26 // and filter animations are known by the tree. |
| 27 return false; | 27 return false; |
| 28 } | 28 } |
| 29 | 29 |
| 30 } // namespace | 30 } // namespace |
| 31 | 31 |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 // be applied. | 111 // be applied. |
| 112 if (!coalesced_transform.IsIdentity()) | 112 if (!coalesced_transform.IsIdentity()) |
| 113 coalesced_transform.TransformBox(&box); | 113 coalesced_transform.TransformBox(&box); |
| 114 | 114 |
| 115 *out = box; | 115 *out = box; |
| 116 | 116 |
| 117 return true; | 117 return true; |
| 118 } | 118 } |
| 119 | 119 |
| 120 } // namespace cc | 120 } // namespace cc |
| OLD | NEW |