Index: cc/trees/layer_tree_impl_unittest.cc |
diff --git a/cc/trees/layer_tree_impl_unittest.cc b/cc/trees/layer_tree_impl_unittest.cc |
index b6cf7f23148086434762b7d1c74c644493137d9c..0e82324b2944f73d67c79aa287b3d24a1ae523fc 100644 |
--- a/cc/trees/layer_tree_impl_unittest.cc |
+++ b/cc/trees/layer_tree_impl_unittest.cc |
@@ -577,13 +577,12 @@ TEST_F(LayerTreeImplTest, HitTestingForMultiClippedRotatedLayer) { |
grand_child->AddChild(std::move(rotated_leaf)); |
child->AddChild(std::move(grand_child)); |
root->AddChild(std::move(child)); |
- |
- ExecuteCalculateDrawProperties(root.get()); |
} |
host_impl().SetViewportSize(root->bounds()); |
host_impl().active_tree()->SetRootLayer(std::move(root)); |
host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree(); |
+ |
// (11, 89) is close to the the bottom left corner within the clip, but it is |
// not inside the layer. |
gfx::PointF test_point(11.f, 89.f); |
@@ -754,8 +753,6 @@ TEST_F(LayerTreeImplTest, HitTestingForMultipleLayers) { |
child1->AddChild(std::move(grand_child1)); |
root->AddChild(std::move(child1)); |
root->AddChild(std::move(child2)); |
- |
- ExecuteCalculateDrawProperties(root.get()); |
} |
LayerImpl* child1 = root->children()[0].get(); |
@@ -1192,7 +1189,7 @@ TEST_F(LayerTreeImplTest, HitTestingForMultipleLayerLists) { |
transform_origin, position, bounds, true, |
false, false); |
child1->SetDrawsContent(true); |
- child1->SetForceRenderSurface(true); |
+ child1->SetHasRenderSurface(true); |
position = gfx::PointF(50.f, 10.f); |
bounds = gfx::Size(50, 50); |
@@ -1200,7 +1197,7 @@ TEST_F(LayerTreeImplTest, HitTestingForMultipleLayerLists) { |
transform_origin, position, bounds, true, |
false, false); |
child2->SetDrawsContent(true); |
- child2->SetForceRenderSurface(true); |
+ child2->SetHasRenderSurface(true); |
// Remember that grand_child is positioned with respect to its parent (i.e. |
// child1). In screen space, the intended position is (10, 50), with size |
@@ -1211,13 +1208,11 @@ TEST_F(LayerTreeImplTest, HitTestingForMultipleLayerLists) { |
transform_origin, position, bounds, true, |
false, false); |
grand_child1->SetDrawsContent(true); |
- grand_child1->SetForceRenderSurface(true); |
+ grand_child1->SetHasRenderSurface(true); |
child1->AddChild(std::move(grand_child1)); |
root->AddChild(std::move(child1)); |
root->AddChild(std::move(child2)); |
- |
- ExecuteCalculateDrawProperties(root.get()); |
} |
LayerImpl* child1 = root->children()[0].get(); |