Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3385)

Unified Diff: cc/layers/layer_utils.cc

Issue 2118993002: Detemplatize cc property nodes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/layer_unittest.cc ('k') | cc/layers/render_surface_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
}
« no previous file with comments | « cc/layers/layer_unittest.cc ('k') | cc/layers/render_surface_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698