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

Unified Diff: cc/trees/layer_tree_impl_unittest.cc

Issue 1491033002: Create RenderSurface on Effect Tree (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@alwayspt
Patch Set: rebase on master Created 5 years 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
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 0e82324b2944f73d67c79aa287b3d24a1ae523fc..b6cf7f23148086434762b7d1c74c644493137d9c 100644
--- a/cc/trees/layer_tree_impl_unittest.cc
+++ b/cc/trees/layer_tree_impl_unittest.cc
@@ -577,12 +577,13 @@ 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);
@@ -753,6 +754,8 @@ 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();
@@ -1189,7 +1192,7 @@ TEST_F(LayerTreeImplTest, HitTestingForMultipleLayerLists) {
transform_origin, position, bounds, true,
false, false);
child1->SetDrawsContent(true);
- child1->SetHasRenderSurface(true);
+ child1->SetForceRenderSurface(true);
position = gfx::PointF(50.f, 10.f);
bounds = gfx::Size(50, 50);
@@ -1197,7 +1200,7 @@ TEST_F(LayerTreeImplTest, HitTestingForMultipleLayerLists) {
transform_origin, position, bounds, true,
false, false);
child2->SetDrawsContent(true);
- child2->SetHasRenderSurface(true);
+ child2->SetForceRenderSurface(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
@@ -1208,11 +1211,13 @@ TEST_F(LayerTreeImplTest, HitTestingForMultipleLayerLists) {
transform_origin, position, bounds, true,
false, false);
grand_child1->SetDrawsContent(true);
- grand_child1->SetHasRenderSurface(true);
+ grand_child1->SetForceRenderSurface(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();

Powered by Google App Engine
This is Rietveld 408576698