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

Unified Diff: cc/trees/layer_tree_host_impl_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_unittest.cc ('k') | cc/trees/layer_tree_host_in_process.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_impl_unittest.cc
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index 3c02d2949cd69701343697e3f19f9bf3dc8fc69d..57a4d093bde5ada40cebae825b624c62eef1d268 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -10102,9 +10102,9 @@ TEST_F(LayerTreeHostImplTest, ExternalTransformAffectsSublayerScaleFactor) {
host_impl_->SetViewportSize(gfx::Size(50, 50));
host_impl_->active_tree()->UpdateDrawProperties(update_lcd_text);
- TransformNode* node =
- host_impl_->active_tree()->property_trees()->transform_tree.Node(
- test_layer->transform_tree_index());
+ EffectNode* node =
+ host_impl_->active_tree()->property_trees()->effect_tree.Node(
+ test_layer->effect_tree_index());
EXPECT_EQ(node->surface_contents_scale, gfx::Vector2dF(1.f, 1.f));
gfx::Transform external_transform;
@@ -10118,8 +10118,8 @@ TEST_F(LayerTreeHostImplTest, ExternalTransformAffectsSublayerScaleFactor) {
// Transform node's sublayer scale should include the device transform scale.
host_impl_->OnDraw(external_transform, external_viewport,
resourceless_software_draw);
- node = host_impl_->active_tree()->property_trees()->transform_tree.Node(
- test_layer->transform_tree_index());
+ node = host_impl_->active_tree()->property_trees()->effect_tree.Node(
+ test_layer->effect_tree_index());
EXPECT_EQ(node->surface_contents_scale, gfx::Vector2dF(2.f, 2.f));
// Clear the external transform.
@@ -10129,8 +10129,8 @@ TEST_F(LayerTreeHostImplTest, ExternalTransformAffectsSublayerScaleFactor) {
host_impl_->OnDraw(external_transform, external_viewport,
resourceless_software_draw);
- node = host_impl_->active_tree()->property_trees()->transform_tree.Node(
- test_layer->transform_tree_index());
+ node = host_impl_->active_tree()->property_trees()->effect_tree.Node(
+ test_layer->effect_tree_index());
EXPECT_EQ(node->surface_contents_scale, gfx::Vector2dF(1.f, 1.f));
}
@@ -11363,9 +11363,9 @@ TEST_F(LayerTreeHostImplTest, SubLayerScaleForNodeInSubtreeOfPageScaleLayer) {
DrawFrame();
- TransformNode* node =
- host_impl_->active_tree()->property_trees()->transform_tree.Node(
- in_subtree_of_page_scale_layer->transform_tree_index());
+ EffectNode* node =
+ host_impl_->active_tree()->property_trees()->effect_tree.Node(
+ in_subtree_of_page_scale_layer->effect_tree_index());
EXPECT_EQ(node->surface_contents_scale, gfx::Vector2dF(1.f, 1.f));
host_impl_->active_tree()->SetPageScaleOnActiveTree(2.f);
@@ -11373,8 +11373,8 @@ TEST_F(LayerTreeHostImplTest, SubLayerScaleForNodeInSubtreeOfPageScaleLayer) {
DrawFrame();
in_subtree_of_page_scale_layer = host_impl_->active_tree()->LayerById(100);
- node = host_impl_->active_tree()->property_trees()->transform_tree.Node(
- in_subtree_of_page_scale_layer->transform_tree_index());
+ node = host_impl_->active_tree()->property_trees()->effect_tree.Node(
+ in_subtree_of_page_scale_layer->effect_tree_index());
EXPECT_EQ(node->surface_contents_scale, gfx::Vector2dF(2.f, 2.f));
}
« no previous file with comments | « cc/trees/layer_tree_host_common_unittest.cc ('k') | cc/trees/layer_tree_host_in_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698