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

Unified Diff: cc/trees/property_tree_unittest.cc

Issue 2183923002: Undo scroll snaps in to_parent when NeedsSourceToParentUpdate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nit change 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/trees/property_tree_builder.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/property_tree_unittest.cc
diff --git a/cc/trees/property_tree_unittest.cc b/cc/trees/property_tree_unittest.cc
index 88c759a7e82b895188cf726d6bc34df6492d15d1..6cc8866e866540d0cf9eaf9a7dee8aca33ae4f94 100644
--- a/cc/trees/property_tree_unittest.cc
+++ b/cc/trees/property_tree_unittest.cc
@@ -1071,11 +1071,13 @@ class PropertyTreeTestNonIntegerTranslationTest : public PropertyTreeTest {
int parent = tree.Insert(TransformNode(), 0);
tree.SetTargetId(parent, parent);
+ tree.Node(parent)->source_node_id = 0;
tree.Node(parent)->local.Translate(1.5f, 1.5f);
int child = tree.Insert(TransformNode(), parent);
tree.SetTargetId(child, parent);
tree.Node(child)->local.Translate(1, 1);
+ tree.Node(child)->source_node_id = parent;
tree.set_needs_update(true);
SetupTransformTreeForTest(&tree);
draw_property_utils::ComputeTransforms(&tree);
@@ -1086,6 +1088,8 @@ class PropertyTreeTestNonIntegerTranslationTest : public PropertyTreeTest {
tree.Node(parent)->local.Translate(0.5f, 0.5f);
tree.Node(child)->local.Translate(0.5f, 0.5f);
+ tree.Node(parent)->needs_local_transform_update = true;
+ tree.Node(child)->needs_local_transform_update = true;
tree.set_needs_update(true);
SetupTransformTreeForTest(&tree);
draw_property_utils::ComputeTransforms(&tree);
@@ -1095,6 +1099,7 @@ class PropertyTreeTestNonIntegerTranslationTest : public PropertyTreeTest {
tree.Node(child)->node_and_ancestors_have_only_integer_translation);
tree.Node(child)->local.Translate(0.5f, 0.5f);
+ tree.Node(child)->needs_local_transform_update = true;
tree.SetTargetId(child, child);
tree.set_needs_update(true);
SetupTransformTreeForTest(&tree);
@@ -1124,6 +1129,7 @@ class PropertyTreeTestSingularTransformSnapTest : public PropertyTreeTest {
effect_tree.Node(effect_parent)->has_render_surface = true;
tree.SetTargetId(parent, parent);
tree.Node(parent)->scrolls = true;
+ tree.Node(parent)->source_node_id = 0;
int child = tree.Insert(TransformNode(), parent);
TransformNode* child_node = tree.Node(child);
@@ -1131,6 +1137,7 @@ class PropertyTreeTestSingularTransformSnapTest : public PropertyTreeTest {
child_node->scrolls = true;
child_node->local.Scale3d(6.0f, 6.0f, 0.0f);
child_node->local.Translate(1.3f, 1.3f);
+ child_node->source_node_id = parent;
tree.set_needs_update(true);
SetupTransformTreeForTest(&tree);
« no previous file with comments | « cc/trees/property_tree_builder.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698