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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/trees/layer_tree_host_common_unittest.cc

Issue 1136643006: Fix cc unit tests that depend on verify_property_trees=true (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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_impl.h » ('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 591f48c43295c82059076b4a6a8cc86656a386dc..4ffefcebffb4251984267a5c33e133058691c597 100644
--- a/cc/trees/layer_tree_host_common_unittest.cc
+++ b/cc/trees/layer_tree_host_common_unittest.cc
@@ -2840,7 +2840,7 @@ TEST_F(LayerTreeHostCommonTest, VisibleContentRectWithClippingAndScaling) {
gfx::Size(100, 100), true, false);
child->SetMasksToBounds(true);
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
// The visible rect is expanded to integer coordinates in target space before
// being projected back to layer space, where it is once again expanded to
@@ -8871,7 +8871,7 @@ TEST_F(LayerTreeHostCommonTest, VisibleContentRectForAnimatedLayer) {
AddOpacityTransitionToController(animated->layer_animation_controller(), 10.0,
0.f, 1.f, false);
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_FALSE(animated->visible_rect_from_property_trees().IsEmpty());
}
@@ -8922,7 +8922,7 @@ TEST_F(LayerTreeHostCommonTest,
AddAnimatedTransformToLayer(animated.get(), 10.0, start_transform_operations,
end_transform_operations);
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
// The animated layer has a singular transform and maps to a non-empty rect in
// clipped target space, so is treated as fully visible.
@@ -8939,7 +8939,7 @@ TEST_F(LayerTreeHostCommonTest,
SetLayerPropertiesForTesting(animated.get(), zero_matrix, gfx::Point3F(),
gfx::PointF(), gfx::Size(120, 120), true, false);
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
// The animated layer maps to the empty rect in clipped target space, so is
// treated as having an empty visible rect.
@@ -9022,7 +9022,7 @@ TEST_F(LayerTreeHostCommonTest, PropertyTreesAccountForFixedParentOffset) {
scoped_ptr<FakeLayerTreeHost> host(CreateFakeLayerTreeHost());
host->SetRootLayer(root);
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(0, 0, 50, 50),
grandchild->visible_rect_from_property_trees());
@@ -9114,7 +9114,7 @@ TEST_F(LayerTreeHostCommonTest, OnlyApplyFixedPositioningOnce) {
scoped_ptr<FakeLayerTreeHost> host(CreateFakeLayerTreeHost());
host->SetRootLayer(root);
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
gfx::Rect expected(0, 0, 100, 100);
EXPECT_EQ(expected, fixed->visible_rect_from_property_trees());
@@ -9171,7 +9171,7 @@ TEST_F(LayerTreeHostCommonTest,
scoped_ptr<FakeLayerTreeHost> host(CreateFakeLayerTreeHost());
host->SetRootLayer(root);
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
gfx::Rect expected(0, 0, 50, 50);
EXPECT_EQ(expected, fixed->visible_rect_from_property_trees());
@@ -9222,7 +9222,7 @@ TEST_F(LayerTreeHostCommonTest, FixedClipsShouldBeAssociatedWithTheRightNode) {
scoped_ptr<FakeLayerTreeHost> host(CreateFakeLayerTreeHost());
host->SetRootLayer(root);
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
gfx::Rect expected(0, 0, 50, 50);
EXPECT_EQ(expected, fixed->visible_rect_from_property_trees());
@@ -9244,7 +9244,8 @@ TEST_F(LayerTreeHostCommonTest, ChangingAxisAlignmentTriggersRebuild) {
scoped_ptr<FakeLayerTreeHost> host(CreateFakeLayerTreeHost());
host->SetRootLayer(root);
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
+ EXPECT_FALSE(host->property_trees()->needs_rebuild);
root->SetTransform(translate);
EXPECT_FALSE(host->property_trees()->needs_rebuild);
@@ -9270,12 +9271,12 @@ TEST_F(LayerTreeHostCommonTest, ChangeTransformOrigin) {
SetLayerPropertiesForTesting(child.get(), scale_matrix, gfx::Point3F(),
gfx::PointF(), gfx::Size(10, 10), true, false);
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(10, 10), child->visible_rect_from_property_trees());
child->SetTransformOrigin(gfx::Point3F(10.f, 10.f, 10.f));
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(5, 5, 5, 5), child->visible_rect_from_property_trees());
}
@@ -9305,13 +9306,13 @@ TEST_F(LayerTreeHostCommonTest, UpdateScrollChildPosition) {
gfx::Point3F(), gfx::PointF(), gfx::Size(30, 30),
true, false);
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(25, 25),
scroll_child->visible_rect_from_property_trees());
scroll_child->SetPosition(gfx::PointF(0, -10.f));
scroll_parent->SetScrollOffset(gfx::ScrollOffset(0.f, 10.f));
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(0, 5, 25, 25),
scroll_child->visible_rect_from_property_trees());
}
@@ -9346,7 +9347,7 @@ TEST_F(LayerTreeHostCommonTest, SkippingSubtreeMain) {
host->SetRootLayer(root);
// Check the non-skipped case.
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(10, 10), grandchild->visible_rect_from_property_trees());
// Now we will reset the visible rect from property trees for the grandchild,
@@ -9358,34 +9359,34 @@ TEST_F(LayerTreeHostCommonTest, SkippingSubtreeMain) {
singular.matrix().set(0, 0, 0);
child->SetTransform(singular);
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(0, 0), grandchild->visible_rect_from_property_trees());
child->SetTransform(identity);
child->SetHideLayerAndSubtree(true);
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(0, 0), grandchild->visible_rect_from_property_trees());
child->SetHideLayerAndSubtree(false);
child->SetOpacity(0.f);
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(0, 0), grandchild->visible_rect_from_property_trees());
// Now, even though child has zero opacity, we will configure |grandchild| and
// |greatgrandchild| in several ways that should force the subtree to be
// processed anyhow.
grandchild->SetTouchEventHandlerRegion(Region(gfx::Rect(0, 0, 10, 10)));
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(10, 10), grandchild->visible_rect_from_property_trees());
grandchild->set_visible_rect_from_property_trees(gfx::Rect());
grandchild->SetTouchEventHandlerRegion(Region());
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(0, 0), grandchild->visible_rect_from_property_trees());
grandchild->set_visible_rect_from_property_trees(gfx::Rect());
greatgrandchild->RequestCopyOfOutput(
CopyOutputRequest::CreateBitmapRequest(base::Bind(&CopyOutputCallback)));
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(10, 10), grandchild->visible_rect_from_property_trees());
}
@@ -9429,7 +9430,7 @@ TEST_F(LayerTreeHostCommonTest, SkippingSubtreeImpl) {
root->AddChild(child.Pass());
// Check the non-skipped case.
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(10, 10),
grandchild_ptr->visible_rect_from_property_trees());
@@ -9442,19 +9443,19 @@ TEST_F(LayerTreeHostCommonTest, SkippingSubtreeImpl) {
singular.matrix().set(0, 0, 0);
child_ptr->SetTransform(singular);
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(0, 0),
grandchild_ptr->visible_rect_from_property_trees());
child_ptr->SetTransform(identity);
child_ptr->SetHideLayerAndSubtree(true);
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(0, 0),
grandchild_ptr->visible_rect_from_property_trees());
child_ptr->SetHideLayerAndSubtree(false);
child_ptr->SetOpacity(0.f);
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(0, 0),
grandchild_ptr->visible_rect_from_property_trees());
@@ -9462,12 +9463,12 @@ TEST_F(LayerTreeHostCommonTest, SkippingSubtreeImpl) {
// |greatgrandchild| in several ways that should force the subtree to be
// processed anyhow.
grandchild_ptr->SetTouchEventHandlerRegion(Region(gfx::Rect(0, 0, 10, 10)));
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(10, 10),
grandchild_ptr->visible_rect_from_property_trees());
grandchild_ptr->set_visible_rect_from_property_trees(gfx::Rect());
grandchild_ptr->SetTouchEventHandlerRegion(Region());
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(0, 0),
grandchild_ptr->visible_rect_from_property_trees());
grandchild_ptr->set_visible_rect_from_property_trees(gfx::Rect());
@@ -9476,7 +9477,7 @@ TEST_F(LayerTreeHostCommonTest, SkippingSubtreeImpl) {
requests.push_back(CopyOutputRequest::CreateEmptyRequest());
greatgrandchild_ptr->PassCopyRequests(&requests);
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(10, 10),
grandchild_ptr->visible_rect_from_property_trees());
}
@@ -9496,17 +9497,17 @@ TEST_F(LayerTreeHostCommonTest, SkippingLayer) {
scoped_ptr<FakeLayerTreeHost> host(CreateFakeLayerTreeHost());
host->SetRootLayer(root);
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(10, 10), child->visible_rect_from_property_trees());
child->set_visible_rect_from_property_trees(gfx::Rect());
child->SetHideLayerAndSubtree(true);
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(0, 0), child->visible_rect_from_property_trees());
child->SetHideLayerAndSubtree(false);
child->SetBounds(gfx::Size());
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(0, 0), child->visible_rect_from_property_trees());
child->SetBounds(gfx::Size(10, 10));
@@ -9514,13 +9515,13 @@ TEST_F(LayerTreeHostCommonTest, SkippingLayer) {
child->SetDoubleSided(false);
rotate.RotateAboutXAxis(180.f);
child->SetTransform(rotate);
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(0, 0), child->visible_rect_from_property_trees());
child->SetDoubleSided(true);
child->SetTransform(identity);
child->SetOpacity(0.f);
- ExecuteCalculateDrawProperties(root.get());
+ ExecuteCalculateDrawPropertiesWithPropertyTrees(root.get());
EXPECT_EQ(gfx::Rect(0, 0), child->visible_rect_from_property_trees());
}
« no previous file with comments | « cc/trees/layer_tree_host_common.cc ('k') | cc/trees/layer_tree_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698