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

Unified Diff: cc/trees/layer_tree_host_common_unittest.cc

Issue 2448403002: cc: Clean up transform tree (Closed)
Patch Set: PAC Created 4 years, 2 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_host_common.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_common_unittest.cc
diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc
index 73f82c08f23181e89cc90abb2ba8005d0cf3176c..287f3a9b286f737a59ef03bef7289f19ba414b5a 100644
--- a/cc/trees/layer_tree_host_common_unittest.cc
+++ b/cc/trees/layer_tree_host_common_unittest.cc
@@ -213,8 +213,7 @@ class LayerTreeHostCommonTestBase : public LayerTestCommon::LayerImplTest {
draw_property_utils::UpdatePropertyTrees(property_trees,
can_render_to_separate_surface);
draw_property_utils::FindLayersThatNeedUpdates(
- root_layer->GetLayerTree(), property_trees->transform_tree,
- property_trees->effect_tree, &update_layer_list_);
+ root_layer->GetLayerTree(), property_trees, &update_layer_list_);
}
void ExecuteCalculateDrawPropertiesAndSaveUpdateLayerList(
@@ -9894,22 +9893,21 @@ TEST_F(LayerTreeHostCommonTest,
test_layer->SetBounds(gfx::Size(30, 30));
test_layer->SetDrawsContent(true);
- // We want layer between the two targets to create a clip node and transform
+ // We want layer between the two targets to create a clip node and effect
// node but it shouldn't create a render surface.
between_targets->SetMasksToBounds(true);
- between_targets->Set3dSortingContextId(2);
+ between_targets->test_properties()->opacity = 0.5f;
ExecuteCalculateDrawProperties(root);
- TransformTree& tree =
- root->layer_tree_impl()->property_trees()->transform_tree;
- TransformNode* node = tree.Node(render_surface1->transform_tree_index());
+ EffectTree& tree = root->layer_tree_impl()->property_trees()->effect_tree;
+ EffectNode* node = tree.Node(render_surface1->effect_tree_index());
EXPECT_EQ(node->surface_contents_scale, gfx::Vector2dF(2.f, 2.f));
- node = tree.Node(between_targets->transform_tree_index());
+ node = tree.Node(between_targets->effect_tree_index());
EXPECT_EQ(node->surface_contents_scale, gfx::Vector2dF(1.f, 1.f));
- node = tree.Node(render_surface2->transform_tree_index());
+ node = tree.Node(render_surface2->effect_tree_index());
EXPECT_EQ(node->surface_contents_scale, gfx::Vector2dF(2.f, 2.f));
EXPECT_EQ(gfx::Rect(15, 15), test_layer->visible_layer_rect());
« no previous file with comments | « cc/trees/layer_tree_host_common.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698