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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/trees/property_tree_unittest.cc

Issue 2087963003: cc: Stop creating unused 0 property tree nodes other than transform 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/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 789761c8f3384f52b66c124137c713375378837c..416189d8251358d6da8f5be7335401fd0cd7e052 100644
--- a/cc/trees/property_tree_unittest.cc
+++ b/cc/trees/property_tree_unittest.cc
@@ -59,25 +59,24 @@ TEST(PropertyTreeSerializationTest, TransformNodeSerialization) {
}
TEST(PropertyTreeSerializationTest, TransformTreeSerialization) {
- PropertyTrees property_trees;
- TransformTree& original = property_trees.transform_tree;
- TransformNode& root = *original.Node(0);
- root.id = 0;
+ TransformTree original;
+ TransformNode root;
root.owner_id = 1;
- original.SetTargetId(root.id, 3);
- original.SetContentTargetId(root.id, 4);
+ root.id = original.Insert(root, TransformTree::kDeviceNodeId);
+ original.SetTargetId(root.id, TransformTree::kDeviceNodeId);
+ original.SetContentTargetId(root.id, TransformTree::kDeviceNodeId);
TransformNode second;
second.owner_id = 2;
second.local.Translate3d(2.f, 2.f, 0.f);
- second.source_node_id = 0;
- second.id = original.Insert(second, 0);
- original.SetTargetId(second.id, 0);
+ second.source_node_id = root.id;
+ second.id = original.Insert(second, root.id);
+ original.SetTargetId(second.id, root.id);
TransformNode third;
third.owner_id = 3;
third.scrolls = true;
- third.source_node_id = 1;
- third.id = original.Insert(third, 1);
- original.SetTargetId(third.id, 0);
+ third.source_node_id = root.id;
+ third.id = original.Insert(third, root.id);
+ original.SetTargetId(third.id, root.id);
original.set_needs_update(true);
@@ -96,9 +95,9 @@ TEST(PropertyTreeSerializationTest, TransformTreeSerialization) {
std::unordered_map<int, int> transform_id_to_index_map;
result.FromProtobuf(proto, &transform_id_to_index_map);
- EXPECT_EQ(transform_id_to_index_map[1], 0);
- EXPECT_EQ(transform_id_to_index_map[2], 1);
- EXPECT_EQ(transform_id_to_index_map[3], 2);
+ EXPECT_EQ(1, transform_id_to_index_map[1]);
+ EXPECT_EQ(2, transform_id_to_index_map[2]);
+ EXPECT_EQ(3, transform_id_to_index_map[3]);
EXPECT_EQ(original, result);
}
@@ -130,7 +129,7 @@ TEST(PropertyTreeSerializationTest, ClipNodeSerialization) {
TEST(PropertyTreeSerializationTest, ClipTreeSerialization) {
ClipTree original;
- ClipNode& root = *original.Node(0);
+ ClipNode root;
root.owner_id = 1;
root.transform_id = 2;
root.target_transform_id = 1;
@@ -145,6 +144,7 @@ TEST(PropertyTreeSerializationTest, ClipTreeSerialization) {
third.target_effect_id = 2;
third.target_is_clipped = false;
+ original.Insert(root, -1);
original.Insert(second, 0);
original.Insert(third, 1);
original.set_needs_update(true);
@@ -186,7 +186,7 @@ TEST(PropertyTreeSerializationTest, EffectNodeSerialization) {
TEST(PropertyTreeSerializationTest, EffectTreeSerialization) {
EffectTree original;
- EffectNode& root = *original.Node(0);
+ EffectNode root;
root.owner_id = 5;
root.transform_id = 2;
root.clip_id = 1;
@@ -202,6 +202,7 @@ TEST(PropertyTreeSerializationTest, EffectTreeSerialization) {
third.replica_mask_layer_id = 45;
third.has_render_surface = false;
+ original.Insert(root, -1);
original.Insert(second, 0);
original.Insert(third, 1);
original.AddMaskOrReplicaLayerId(32);
@@ -248,6 +249,8 @@ TEST(PropertyTreeSerializationTest, ScrollTreeSerialization) {
PropertyTrees property_trees;
property_trees.is_main_thread = true;
ScrollTree& original = property_trees.scroll_tree;
+ ScrollNode root;
+ original.Insert(root, -1);
ScrollNode second;
second.owner_id = 10;
second.scrollable = true;
@@ -273,6 +276,8 @@ TEST(PropertyTreeSerializationTest, ScrollTreeSerialization) {
EXPECT_EQ(scroll_id_to_index_map[20], 2);
original.clear();
+ ScrollNode root2;
+ original.Insert(root, -1);
original.set_currently_scrolling_node(0);
original.SetScrollOffset(2, gfx::ScrollOffset(1, 2));
@@ -289,39 +294,44 @@ TEST(PropertyTreeSerializationTest, PropertyTrees) {
PropertyTrees original;
TransformNode transform_node1 = TransformNode();
transform_node1.owner_id = 10;
- transform_node1.id = original.transform_tree.Insert(transform_node1, 0);
+ transform_node1.id = original.transform_tree.Insert(
+ transform_node1, TransformTree::kDeviceNodeId);
TransformNode transform_node2 = TransformNode();
transform_node2.owner_id = 20;
- transform_node2.id = original.transform_tree.Insert(transform_node2, 1);
- original.transform_id_to_index_map[10] = 1;
- original.transform_id_to_index_map[20] = 2;
+ transform_node2.id =
+ original.transform_tree.Insert(transform_node2, transform_node1.id);
+ original.transform_id_to_index_map[10] = transform_node1.id;
+ original.transform_id_to_index_map[20] = transform_node2.id;
ClipNode clip_node1 = ClipNode();
clip_node1.owner_id = 10;
- clip_node1.id = original.clip_tree.Insert(clip_node1, 0);
+ clip_node1.id =
+ original.clip_tree.Insert(clip_node1, ClipTree::kInvalidNodeId);
ClipNode clip_node2 = ClipNode();
clip_node2.owner_id = 22;
- clip_node2.id = original.clip_tree.Insert(clip_node2, 1);
- original.clip_id_to_index_map[10] = 1;
- original.clip_id_to_index_map[22] = 2;
+ clip_node2.id = original.clip_tree.Insert(clip_node2, clip_node1.id);
+ original.clip_id_to_index_map[10] = clip_node1.id;
+ original.clip_id_to_index_map[22] = clip_node2.id;
EffectNode effect_node1 = EffectNode();
effect_node1.owner_id = 11;
- effect_node1.id = original.effect_tree.Insert(effect_node1, 0);
+ effect_node1.id =
+ original.effect_tree.Insert(effect_node1, EffectTree::kInvalidNodeId);
EffectNode effect_node2 = EffectNode();
effect_node2.owner_id = 23;
- effect_node2.id = original.effect_tree.Insert(effect_node2, 1);
- original.effect_id_to_index_map[11] = 1;
- original.effect_id_to_index_map[23] = 2;
+ effect_node2.id = original.effect_tree.Insert(effect_node2, effect_node1.id);
+ original.effect_id_to_index_map[11] = effect_node1.id;
+ original.effect_id_to_index_map[23] = effect_node2.id;
ScrollNode scroll_node1 = ScrollNode();
scroll_node1.owner_id = 10;
- scroll_node1.id = original.scroll_tree.Insert(scroll_node1, 0);
+ scroll_node1.id =
+ original.scroll_tree.Insert(scroll_node1, ScrollTree::kInvalidNodeId);
ScrollNode scroll_node2 = ScrollNode();
scroll_node2.owner_id = 20;
- scroll_node2.id = original.scroll_tree.Insert(scroll_node2, 1);
- original.scroll_id_to_index_map[10] = 1;
- original.scroll_id_to_index_map[20] = 2;
+ scroll_node2.id = original.scroll_tree.Insert(scroll_node2, scroll_node1.id);
+ original.scroll_id_to_index_map[10] = scroll_node1.id;
+ original.scroll_id_to_index_map[20] = scroll_node2.id;
original.needs_rebuild = false;
original.non_root_surfaces_enabled = false;
@@ -396,29 +406,31 @@ class PropertyTreeTestComputeTransformRoot : public PropertyTreeTest {
void StartTest() override {
PropertyTrees property_trees;
TransformTree& tree = property_trees.transform_tree;
- TransformNode& root = *tree.Node(0);
- root.id = 0;
+ TransformNode root;
root.local.Translate(2, 2);
- tree.SetTargetId(root.id, 0);
+ root.id = tree.Insert(root, TransformTree::kDeviceNodeId);
+ tree.SetTargetId(root.id, TransformTree::kDeviceNodeId);
SetupTransformTreeForTest(&tree);
- tree.UpdateTransforms(0);
+ tree.UpdateTransforms(root.id);
gfx::Transform expected;
gfx::Transform transform;
- bool success = tree.ComputeTransform(0, 0, &transform);
+ bool success = tree.ComputeTransform(root.id, root.id, &transform);
EXPECT_TRUE(success);
EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
transform.MakeIdentity();
expected.Translate(2, 2);
- success = tree.ComputeTransform(0, -1, &transform);
+ success = tree.ComputeTransform(root.id, TransformTree::kDeviceNodeId,
+ &transform);
EXPECT_TRUE(success);
EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
transform.MakeIdentity();
expected.MakeIdentity();
expected.Translate(-2, -2);
- success = tree.ComputeTransform(-1, 0, &transform);
+ success = tree.ComputeTransform(TransformTree::kDeviceNodeId, root.id,
+ &transform);
EXPECT_TRUE(success);
EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
}
@@ -432,46 +444,49 @@ class PropertyTreeTestComputeTransformChild : public PropertyTreeTest {
void StartTest() override {
PropertyTrees property_trees;
TransformTree& tree = property_trees.transform_tree;
- TransformNode& root = *tree.Node(0);
+ TransformNode root;
root.local.Translate(2, 2);
- tree.SetTargetId(root.id, 0);
- tree.UpdateTransforms(0);
+ root.id = tree.Insert(root, TransformTree::kDeviceNodeId);
+ tree.SetTargetId(root.id, TransformTree::kDeviceNodeId);
+ tree.UpdateTransforms(root.id);
TransformNode child;
child.local.Translate(3, 3);
- child.source_node_id = 0;
- child.id = tree.Insert(child, 0);
- tree.SetTargetId(child.id, 0);
+ child.source_node_id = root.id;
+ child.id = tree.Insert(child, root.id);
+ tree.SetTargetId(child.id, root.id);
SetupTransformTreeForTest(&tree);
- tree.UpdateTransforms(1);
+ tree.UpdateTransforms(child.id);
gfx::Transform expected;
gfx::Transform transform;
expected.Translate(3, 3);
- bool success = tree.ComputeTransform(1, 0, &transform);
+ bool success = tree.ComputeTransform(child.id, root.id, &transform);
EXPECT_TRUE(success);
EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
transform.MakeIdentity();
expected.MakeIdentity();
expected.Translate(-3, -3);
- success = tree.ComputeTransform(0, 1, &transform);
+ success = tree.ComputeTransform(root.id, child.id, &transform);
EXPECT_TRUE(success);
EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
transform.MakeIdentity();
expected.MakeIdentity();
expected.Translate(5, 5);
- success = tree.ComputeTransform(1, -1, &transform);
+ success = tree.ComputeTransform(child.id, TransformTree::kDeviceNodeId,
+ &transform);
EXPECT_TRUE(success);
EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
transform.MakeIdentity();
expected.MakeIdentity();
expected.Translate(-5, -5);
- success = tree.ComputeTransform(-1, 1, &transform);
+ success = tree.ComputeTransform(TransformTree::kDeviceNodeId, child.id,
+ &transform);
EXPECT_TRUE(success);
EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
}
@@ -485,40 +500,41 @@ class PropertyTreeTestComputeTransformSibling : public PropertyTreeTest {
void StartTest() override {
PropertyTrees property_trees;
TransformTree& tree = property_trees.transform_tree;
- TransformNode& root = *tree.Node(0);
+ TransformNode root;
root.local.Translate(2, 2);
- tree.SetTargetId(root.id, 0);
- tree.UpdateTransforms(0);
+ root.id = tree.Insert(root, TransformTree::kDeviceNodeId);
+ tree.SetTargetId(root.id, TransformTree::kDeviceNodeId);
+ tree.UpdateTransforms(root.id);
TransformNode child;
child.local.Translate(3, 3);
- child.source_node_id = 0;
- child.id = tree.Insert(child, 0);
- tree.SetTargetId(child.id, 0);
+ child.source_node_id = root.id;
+ child.id = tree.Insert(child, root.id);
+ tree.SetTargetId(child.id, root.id);
TransformNode sibling;
sibling.local.Translate(7, 7);
- sibling.source_node_id = 0;
- sibling.id = tree.Insert(sibling, 0);
- tree.SetTargetId(sibling.id, 0);
+ sibling.source_node_id = root.id;
+ sibling.id = tree.Insert(sibling, root.id);
+ tree.SetTargetId(sibling.id, root.id);
SetupTransformTreeForTest(&tree);
- tree.UpdateTransforms(1);
- tree.UpdateTransforms(2);
+ tree.UpdateTransforms(child.id);
+ tree.UpdateTransforms(sibling.id);
gfx::Transform expected;
gfx::Transform transform;
expected.Translate(4, 4);
- bool success = tree.ComputeTransform(2, 1, &transform);
+ bool success = tree.ComputeTransform(sibling.id, child.id, &transform);
EXPECT_TRUE(success);
EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
transform.MakeIdentity();
expected.MakeIdentity();
expected.Translate(-4, -4);
- success = tree.ComputeTransform(1, 2, &transform);
+ success = tree.ComputeTransform(child.id, sibling.id, &transform);
EXPECT_TRUE(success);
EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
}
@@ -542,47 +558,48 @@ class PropertyTreeTestComputeTransformSiblingSingularAncestor
// transforms between these nodes.
PropertyTrees property_trees;
TransformTree& tree = property_trees.transform_tree;
- TransformNode& root = *tree.Node(0);
+ TransformNode root;
root.local.Translate(2, 2);
- tree.SetTargetId(root.id, 0);
- tree.UpdateTransforms(0);
+ root.id = tree.Insert(root, TransformTree::kDeviceNodeId);
+ tree.SetTargetId(root.id, root.id);
+ tree.UpdateTransforms(root.id);
TransformNode singular;
singular.local.matrix().set(2, 2, 0.0);
- singular.source_node_id = 0;
- singular.id = tree.Insert(singular, 0);
- tree.SetTargetId(singular.id, 0);
+ singular.source_node_id = root.id;
+ singular.id = tree.Insert(singular, root.id);
+ tree.SetTargetId(singular.id, root.id);
TransformNode child;
child.local.Translate(3, 3);
- child.source_node_id = 1;
- child.id = tree.Insert(child, 1);
- tree.SetTargetId(child.id, 0);
+ child.source_node_id = singular.id;
+ child.id = tree.Insert(child, singular.id);
+ tree.SetTargetId(child.id, root.id);
TransformNode sibling;
sibling.local.Translate(7, 7);
- sibling.source_node_id = 1;
- sibling.id = tree.Insert(sibling, 1);
- tree.SetTargetId(sibling.id, 0);
+ sibling.source_node_id = singular.id;
+ sibling.id = tree.Insert(sibling, singular.id);
+ tree.SetTargetId(sibling.id, root.id);
SetupTransformTreeForTest(&tree);
- tree.UpdateTransforms(1);
- tree.UpdateTransforms(2);
- tree.UpdateTransforms(3);
+ tree.UpdateTransforms(singular.id);
+ tree.UpdateTransforms(child.id);
+ tree.UpdateTransforms(sibling.id);
gfx::Transform expected;
gfx::Transform transform;
expected.Translate(4, 4);
- bool success = tree.ComputeTransform(3, 2, &transform);
+ bool success = tree.ComputeTransform(sibling.id, child.id, &transform);
EXPECT_TRUE(success);
EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
transform.MakeIdentity();
expected.MakeIdentity();
expected.Translate(-4, -4);
- success = tree.ComputeTransform(2, 3, &transform);
+ success = tree.ComputeTransform(child.id, sibling.id, &transform);
EXPECT_TRUE(success);
EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
}
@@ -597,10 +614,11 @@ class PropertyTreeTestTransformsWithFlattening : public PropertyTreeTest {
PropertyTrees property_trees;
TransformTree& tree = property_trees.transform_tree;
- int grand_parent = tree.Insert(TransformNode(), 0);
+ int grand_parent =
+ tree.Insert(TransformNode(), TransformTree::kDeviceNodeId);
tree.SetContentTargetId(grand_parent, grand_parent);
tree.SetTargetId(grand_parent, grand_parent);
- tree.Node(grand_parent)->source_node_id = 0;
+ tree.Node(grand_parent)->source_node_id = TransformTree::kDeviceNodeId;
gfx::Transform rotation_about_x;
rotation_about_x.RotateAboutXAxis(15);
@@ -680,19 +698,20 @@ class PropertyTreeTestMultiplicationOrder : public PropertyTreeTest {
void StartTest() override {
PropertyTrees property_trees;
TransformTree& tree = property_trees.transform_tree;
- TransformNode& root = *tree.Node(0);
+ TransformNode root;
root.local.Translate(2, 2);
- tree.SetTargetId(root.id, 0);
- tree.UpdateTransforms(0);
+ root.id = tree.Insert(root, TransformTree::kDeviceNodeId);
+ tree.SetTargetId(root.id, TransformTree::kDeviceNodeId);
+ tree.UpdateTransforms(root.id);
TransformNode child;
child.local.Scale(2, 2);
- child.source_node_id = 0;
- child.id = tree.Insert(child, 0);
- tree.SetTargetId(child.id, 0);
+ child.source_node_id = root.id;
+ child.id = tree.Insert(child, root.id);
+ tree.SetTargetId(child.id, root.id);
SetupTransformTreeForTest(&tree);
- tree.UpdateTransforms(1);
+ tree.UpdateTransforms(child.id);
gfx::Transform expected;
expected.Translate(2, 2);
@@ -701,11 +720,13 @@ class PropertyTreeTestMultiplicationOrder : public PropertyTreeTest {
gfx::Transform transform;
gfx::Transform inverse;
- bool success = tree.ComputeTransform(1, -1, &transform);
+ bool success = tree.ComputeTransform(child.id, TransformTree::kDeviceNodeId,
+ &transform);
EXPECT_TRUE(success);
EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
- success = tree.ComputeTransform(-1, 1, &inverse);
+ success =
+ tree.ComputeTransform(TransformTree::kDeviceNodeId, child.id, &inverse);
EXPECT_TRUE(success);
transform = transform * inverse;
@@ -722,18 +743,19 @@ class PropertyTreeTestComputeTransformWithUninvertibleTransform
void StartTest() override {
PropertyTrees property_trees;
TransformTree& tree = property_trees.transform_tree;
- TransformNode& root = *tree.Node(0);
- tree.SetTargetId(root.id, 0);
- tree.UpdateTransforms(0);
+ TransformNode root;
+ root.id = tree.Insert(root, TransformTree::kDeviceNodeId);
+ tree.SetTargetId(root.id, TransformTree::kDeviceNodeId);
+ tree.UpdateTransforms(root.id);
TransformNode child;
child.local.Scale(0, 0);
- child.source_node_id = 0;
- child.id = tree.Insert(child, 0);
- tree.SetTargetId(child.id, 0);
+ child.source_node_id = root.id;
+ child.id = tree.Insert(child, root.id);
+ tree.SetTargetId(child.id, root.id);
SetupTransformTreeForTest(&tree);
- tree.UpdateTransforms(1);
+ tree.UpdateTransforms(child.id);
gfx::Transform expected;
expected.Scale(0, 0);
@@ -741,13 +763,13 @@ class PropertyTreeTestComputeTransformWithUninvertibleTransform
gfx::Transform transform;
gfx::Transform inverse;
- bool success = tree.ComputeTransform(1, 0, &transform);
+ bool success = tree.ComputeTransform(child.id, root.id, &transform);
EXPECT_TRUE(success);
EXPECT_TRANSFORMATION_MATRIX_EQ(expected, transform);
// To compute this would require inverting the 0 matrix, so we cannot
// succeed.
- success = tree.ComputeTransform(0, 1, &inverse);
+ success = tree.ComputeTransform(root.id, child.id, &inverse);
EXPECT_FALSE(success);
}
};
@@ -761,17 +783,17 @@ class PropertyTreeTestComputeTransformWithSublayerScale
void StartTest() override {
PropertyTrees property_trees;
TransformTree& tree = property_trees.transform_tree;
- TransformNode& root = *tree.Node(0);
- root.id = 0;
- tree.SetTargetId(root.id, 0);
- tree.UpdateTransforms(0);
+ TransformNode root;
+ root.id = tree.Insert(root, TransformTree::kDeviceNodeId);
+ tree.SetTargetId(root.id, TransformTree::kDeviceNodeId);
+ tree.UpdateTransforms(root.id);
TransformNode grand_parent;
grand_parent.local.Scale(2.f, 2.f);
- grand_parent.source_node_id = 0;
+ grand_parent.source_node_id = root.id;
grand_parent.needs_sublayer_scale = true;
- int grand_parent_id = tree.Insert(grand_parent, 0);
- tree.SetTargetId(grand_parent_id, 0);
+ int grand_parent_id = tree.Insert(grand_parent, root.id);
+ tree.SetTargetId(grand_parent_id, root.id);
tree.UpdateTransforms(grand_parent_id);
TransformNode parent;
@@ -880,16 +902,17 @@ class PropertyTreeTestComputeTransformToTargetWithZeroSublayerScale
void StartTest() override {
PropertyTrees property_trees;
TransformTree& tree = property_trees.transform_tree;
- TransformNode& root = *tree.Node(0);
- tree.SetTargetId(root.id, 0);
- tree.UpdateTransforms(0);
+ TransformNode root;
+ root.id = tree.Insert(root, TransformTree::kDeviceNodeId);
+ tree.SetTargetId(root.id, TransformTree::kDeviceNodeId);
+ tree.UpdateTransforms(root.id);
TransformNode grand_parent;
grand_parent.local.Scale(2.f, 0.f);
- grand_parent.source_node_id = 0;
+ grand_parent.source_node_id = root.id;
grand_parent.needs_sublayer_scale = true;
- int grand_parent_id = tree.Insert(grand_parent, 0);
- tree.SetTargetId(grand_parent_id, 0);
+ int grand_parent_id = tree.Insert(grand_parent, root.id);
+ tree.SetTargetId(grand_parent_id, root.id);
tree.SetContentTargetId(grand_parent_id, grand_parent_id);
tree.UpdateTransforms(grand_parent_id);
@@ -957,10 +980,10 @@ class PropertyTreeTestFlatteningWhenDestinationHasOnlyFlatAncestors
PropertyTrees property_trees;
TransformTree& tree = property_trees.transform_tree;
- int parent = tree.Insert(TransformNode(), 0);
+ int parent = tree.Insert(TransformNode(), TransformTree::kDeviceNodeId);
tree.SetContentTargetId(parent, parent);
tree.SetTargetId(parent, parent);
- tree.Node(parent)->source_node_id = 0;
+ tree.Node(parent)->source_node_id = TransformTree::kDeviceNodeId;
tree.Node(parent)->local.Translate(2, 2);
gfx::Transform rotation_about_x;
@@ -1004,7 +1027,7 @@ class PropertyTreeTestScreenSpaceOpacityUpdateTest : public PropertyTreeTest {
// opacity of a node changes.
EffectTree tree;
- int parent = tree.Insert(EffectNode(), 0);
+ int parent = tree.Insert(EffectNode(), EffectTree::kInvalidNodeId);
int child = tree.Insert(EffectNode(), parent);
SetupEffectTreeForTest(&tree);
@@ -1034,7 +1057,7 @@ class PropertyTreeTestNonIntegerTranslationTest : public PropertyTreeTest {
PropertyTrees property_trees;
TransformTree& tree = property_trees.transform_tree;
- int parent = tree.Insert(TransformNode(), 0);
+ int parent = tree.Insert(TransformNode(), TransformTree::kDeviceNodeId);
tree.SetTargetId(parent, parent);
tree.Node(parent)->local.Translate(1.5f, 1.5f);
@@ -1082,7 +1105,7 @@ class PropertyTreeTestSingularTransformSnapTest : public PropertyTreeTest {
PropertyTrees property_trees;
TransformTree& tree = property_trees.transform_tree;
- int parent = tree.Insert(TransformNode(), 0);
+ int parent = tree.Insert(TransformNode(), TransformTree::kDeviceNodeId);
tree.SetTargetId(parent, parent);
tree.Node(parent)->scrolls = true;
« 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