| 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));
|
| }
|
|
|
|
|