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

Unified Diff: cc/trees/property_tree.h

Issue 1013463003: Update from https://crrev.com/320931 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 9 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/trees/layer_tree_settings.cc ('k') | cc/trees/property_tree.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/property_tree.h
diff --git a/cc/trees/property_tree.h b/cc/trees/property_tree.h
index cb00e8adc5247fb777c48683a04d0ddf93d87764..a79ce554b0486366acfe78c2736866ea52739610 100644
--- a/cc/trees/property_tree.h
+++ b/cc/trees/property_tree.h
@@ -47,7 +47,6 @@ struct CC_EXPORT TransformNodeData {
gfx::Transform post_local;
gfx::Transform to_parent;
- gfx::Transform from_parent;
gfx::Transform to_target;
gfx::Transform from_target;
@@ -69,13 +68,14 @@ struct CC_EXPORT TransformNodeData {
bool is_animated;
bool to_screen_is_animated;
- // We don't necessarily create a transform node to apply flattening. If we've
- // skipped flattening for an ancestor, we must flatten the transform we
- // inherit, but we don't necessarily need to flatten our local transform. We
- // must therefore use two values to describe the flattening required for the
- // local and inherited transforms.
+ // Flattening, when needed, is only applied to a node's inherited transform,
+ // never to its local transform.
bool flattens_inherited_transform;
- bool flattens_local_transform;
+
+ // This is true if the to_parent transform at every node on the path to the
+ // root is flat.
+ bool node_and_ancestors_are_flat;
+
bool scrolls;
bool needs_sublayer_scale;
@@ -89,7 +89,7 @@ struct CC_EXPORT TransformNodeData {
void set_to_parent(const gfx::Transform& transform) {
to_parent = transform;
- is_invertible = to_parent.GetInverse(&from_parent);
+ is_invertible = to_parent.IsInvertible();
}
};
« no previous file with comments | « cc/trees/layer_tree_settings.cc ('k') | cc/trees/property_tree.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698