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/trees/property_tree.h" | 5 #include "cc/trees/property_tree.h" |
6 | 6 |
7 #include "cc/input/main_thread_scrolling_reason.h" | 7 #include "cc/input/main_thread_scrolling_reason.h" |
8 #include "cc/proto/property_tree.pb.h" | 8 #include "cc/proto/property_tree.pb.h" |
9 #include "cc/test/geometry_test_utils.h" | 9 #include "cc/test/geometry_test_utils.h" |
10 #include "cc/trees/clip_node.h" | 10 #include "cc/trees/clip_node.h" |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 third.id = original.Insert(third, 1); | 77 third.id = original.Insert(third, 1); |
78 original.SetTargetId(third.id, 0); | 78 original.SetTargetId(third.id, 0); |
79 | 79 |
80 original.set_needs_update(true); | 80 original.set_needs_update(true); |
81 | 81 |
82 original.set_page_scale_factor(0.5f); | 82 original.set_page_scale_factor(0.5f); |
83 original.set_device_scale_factor(0.6f); | 83 original.set_device_scale_factor(0.6f); |
84 gfx::Transform transform = | 84 gfx::Transform transform = |
85 gfx::Transform(1.05f, 2.15f, 3.14f, 4.13f, 5.12f, 6.11f, 7.1f, 8.9f, 9.8f, | 85 gfx::Transform(1.05f, 2.15f, 3.14f, 4.13f, 5.12f, 6.11f, 7.1f, 8.9f, 9.8f, |
86 10.7f, 11.6f, 12.5f, 13.4f, 14.3f, 15.2f, 16.1f); | 86 10.7f, 11.6f, 12.5f, 13.4f, 14.3f, 15.2f, 16.1f); |
87 original.SetRootTransformsAndScales(0.6f, 1.f, transform, gfx::PointF()); | 87 original.SetDeviceTransformScaleFactor(transform); |
88 original.AddNodeAffectedByInnerViewportBoundsDelta(0); | 88 original.AddNodeAffectedByInnerViewportBoundsDelta(0); |
89 original.AddNodeAffectedByOuterViewportBoundsDelta(1); | 89 original.AddNodeAffectedByOuterViewportBoundsDelta(1); |
90 | 90 |
91 proto::PropertyTree proto; | 91 proto::PropertyTree proto; |
92 original.ToProtobuf(&proto); | 92 original.ToProtobuf(&proto); |
93 TransformTree result; | 93 TransformTree result; |
94 std::unordered_map<int, int> transform_id_to_index_map; | 94 std::unordered_map<int, int> transform_id_to_index_map; |
95 result.FromProtobuf(proto, &transform_id_to_index_map); | 95 result.FromProtobuf(proto, &transform_id_to_index_map); |
96 | 96 |
97 EXPECT_EQ(transform_id_to_index_map[1], 0); | 97 EXPECT_EQ(transform_id_to_index_map[1], 0); |
(...skipping 876 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
974 void StartTest() override { | 974 void StartTest() override { |
975 // This tests that to_target transform is not snapped when it has a singular | 975 // This tests that to_target transform is not snapped when it has a singular |
976 // transform. | 976 // transform. |
977 PropertyTrees property_trees; | 977 PropertyTrees property_trees; |
978 TransformTree& tree = property_trees.transform_tree; | 978 TransformTree& tree = property_trees.transform_tree; |
979 EffectTree& effect_tree = property_trees.effect_tree; | 979 EffectTree& effect_tree = property_trees.effect_tree; |
980 | 980 |
981 int parent = tree.Insert(TransformNode(), 0); | 981 int parent = tree.Insert(TransformNode(), 0); |
982 int effect_parent = effect_tree.Insert(EffectNode(), 0); | 982 int effect_parent = effect_tree.Insert(EffectNode(), 0); |
983 effect_tree.Node(effect_parent)->has_render_surface = true; | 983 effect_tree.Node(effect_parent)->has_render_surface = true; |
984 effect_tree.Node(effect_parent)->surface_contents_scale = | |
985 gfx::Vector2dF(1.f, 1.f); | |
986 | |
987 tree.SetTargetId(parent, parent); | 984 tree.SetTargetId(parent, parent); |
988 tree.Node(parent)->scrolls = true; | 985 tree.Node(parent)->scrolls = true; |
989 tree.Node(parent)->source_node_id = 0; | 986 tree.Node(parent)->source_node_id = 0; |
990 | 987 |
991 int child = tree.Insert(TransformNode(), parent); | 988 int child = tree.Insert(TransformNode(), parent); |
992 TransformNode* child_node = tree.Node(child); | 989 TransformNode* child_node = tree.Node(child); |
993 tree.SetTargetId(child, parent); | 990 tree.SetTargetId(child, parent); |
994 child_node->scrolls = true; | 991 child_node->scrolls = true; |
995 child_node->local.Scale3d(6.0f, 6.0f, 0.0f); | 992 child_node->local.Scale3d(6.0f, 6.0f, 0.0f); |
996 child_node->local.Translate(1.3f, 1.3f); | 993 child_node->local.Translate(1.3f, 1.3f); |
(...skipping 27 matching lines...) Expand all Loading... |
1024 | 1021 |
1025 DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F( | 1022 DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F( |
1026 PropertyTreeTestSingularTransformSnapTest); | 1023 PropertyTreeTestSingularTransformSnapTest); |
1027 | 1024 |
1028 #undef DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F | 1025 #undef DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F |
1029 #undef SERIALIZED_PROPERTY_TREE_TEST_F | 1026 #undef SERIALIZED_PROPERTY_TREE_TEST_F |
1030 #undef DIRECT_PROPERTY_TREE_TEST_F | 1027 #undef DIRECT_PROPERTY_TREE_TEST_F |
1031 | 1028 |
1032 } // namespace | 1029 } // namespace |
1033 } // namespace cc | 1030 } // namespace cc |
OLD | NEW |