summaryrefslogtreecommitdiffstats
path: root/cc/trees/layer_tree_host_common_unittest.cc
diff options
context:
space:
mode:
authordstockwell@chromium.org <dstockwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-10 01:21:49 +0000
committerdstockwell@chromium.org <dstockwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-10 01:21:49 +0000
commit48c46ebdd30b499ed153efc88e8f67468cc1d0e2 (patch)
tree9834c2ab84f58569ddb125c31749adae6904bc08 /cc/trees/layer_tree_host_common_unittest.cc
parent2b3c3e1ec12d742b412c0bcdc85d0a6b35352dee (diff)
downloadchromium_src-48c46ebdd30b499ed153efc88e8f67468cc1d0e2.zip
chromium_src-48c46ebdd30b499ed153efc88e8f67468cc1d0e2.tar.gz
chromium_src-48c46ebdd30b499ed153efc88e8f67468cc1d0e2.tar.bz2
Revert of Split preserve3d into: "should-flatten" and "is-3d-sorted" (https://codereview.chromium.org/147833003/)
Reason for revert: Introduces flakiness in Blink layout tests: http://test-results.appspot.com/dashboards/flakiness_dashboard.html#group=%2540ToT%2520Blink&tests=compositing%252Fbackface-visibility-transformed Original issue's description: > Split preserve3d into: "should-flatten" and "is-3d-sorted" > > Preserve3d has implications for both sorting and flattening of > transforms. This is a bummer. Sometimes we want to allow a transform to > remain unflattened, but we don't want that to affect 3d sorting. With > this CL, we will have the ability to do that. > > Note: this is essentially this cl > https://codereview.chromium.org/100393005/ > > ..minus the generalizations to sorting that were being attempted in that > patch. > > Note, this CL is gated on https://codereview.chromium.org/98373011/ > > R=enne@chromium.org > BUG=338980 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=249974 TBR=enne@chromium.org,shawnsingh@chromium.org,vollick@chromium.org NOTREECHECKS=true NOTRY=true BUG=338980 Review URL: https://codereview.chromium.org/158563003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250031 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/trees/layer_tree_host_common_unittest.cc')
-rw-r--r--cc/trees/layer_tree_host_common_unittest.cc505
1 files changed, 48 insertions, 457 deletions
diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc
index 1fdc7ae..570a109 100644
--- a/cc/trees/layer_tree_host_common_unittest.cc
+++ b/cc/trees/layer_tree_host_common_unittest.cc
@@ -45,15 +45,13 @@ class LayerTreeHostCommonTestBase {
const gfx::PointF& anchor,
const gfx::PointF& position,
const gfx::Size& bounds,
- bool flatten_transform,
- bool is_3d_sorted) {
+ bool preserves3d) {
layer->SetTransform(transform);
layer->SetSublayerTransform(sublayer_transform);
layer->SetAnchorPoint(anchor);
layer->SetPosition(position);
layer->SetBounds(bounds);
- layer->SetShouldFlattenTransform(flatten_transform);
- layer->SetIs3dSorted(is_3d_sorted);
+ layer->SetPreserves3d(preserves3d);
}
void SetLayerPropertiesForTesting(Layer* layer,
@@ -62,16 +60,14 @@ class LayerTreeHostCommonTestBase {
const gfx::PointF& anchor,
const gfx::PointF& position,
const gfx::Size& bounds,
- bool flatten_transform,
- bool is_3d_sorted) {
+ bool preserves3d) {
SetLayerPropertiesForTestingInternal<Layer>(layer,
transform,
sublayer_transform,
anchor,
position,
bounds,
- flatten_transform,
- is_3d_sorted);
+ preserves3d);
}
void SetLayerPropertiesForTesting(LayerImpl* layer,
@@ -80,16 +76,14 @@ class LayerTreeHostCommonTestBase {
const gfx::PointF& anchor,
const gfx::PointF& position,
const gfx::Size& bounds,
- bool flatten_transform,
- bool is_3d_sorted) {
+ bool preserves3d) {
SetLayerPropertiesForTestingInternal<LayerImpl>(layer,
transform,
sublayer_transform,
anchor,
position,
bounds,
- flatten_transform,
- is_3d_sorted);
+ preserves3d);
layer->SetContentBounds(bounds);
}
@@ -242,7 +236,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForNoOpLayer) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
identity_matrix,
@@ -250,7 +243,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForNoOpLayer) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(),
- true,
false);
SetLayerPropertiesForTesting(grand_child.get(),
identity_matrix,
@@ -258,7 +250,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForNoOpLayer) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(),
- true,
false);
ExecuteCalculateDrawProperties(parent.get());
@@ -283,7 +274,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSingleLayer) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(1, 2),
- true,
false);
root->AddChild(layer);
@@ -300,7 +290,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSingleLayer) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
ExecuteCalculateDrawProperties(root.get());
gfx::Transform expected_draw_transform = identity_matrix;
@@ -319,7 +308,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSingleLayer) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 12),
- true,
false);
ExecuteCalculateDrawProperties(root.get());
EXPECT_TRANSFORMATION_MATRIX_EQ(identity_matrix, layer->draw_transform());
@@ -334,7 +322,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSingleLayer) {
gfx::PointF(0.25f, 0.25f),
gfx::PointF(),
gfx::Size(10, 12),
- true,
false);
ExecuteCalculateDrawProperties(root.get());
EXPECT_TRANSFORMATION_MATRIX_EQ(identity_matrix, layer->draw_transform());
@@ -351,7 +338,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSingleLayer) {
gfx::PointF(0.25f, 0.25f),
gfx::PointF(0.f, 1.2f),
gfx::Size(10, 12),
- true,
false);
ExecuteCalculateDrawProperties(root.get());
EXPECT_TRANSFORMATION_MATRIX_EQ(position_transform, layer->draw_transform());
@@ -369,7 +355,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSingleLayer) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 12),
- true,
false);
ExecuteCalculateDrawProperties(root.get());
EXPECT_TRANSFORMATION_MATRIX_EQ(layer_transform, layer->draw_transform());
@@ -387,7 +372,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSingleLayer) {
gfx::PointF(0.5f, 0.f),
gfx::PointF(),
gfx::Size(10, 12),
- true,
false);
ExecuteCalculateDrawProperties(root.get());
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_result, layer->draw_transform());
@@ -405,7 +389,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSingleLayer) {
gfx::PointF(0.5f, 0.f),
gfx::PointF(0.f, 1.2f),
gfx::Size(10, 12),
- true,
false);
ExecuteCalculateDrawProperties(root.get());
EXPECT_TRANSFORMATION_MATRIX_EQ(expected_result, layer->draw_transform());
@@ -437,7 +420,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsAboutScrollOffset) {
gfx::Point(),
gfx::PointF(),
gfx::Size(500, 500),
- true,
false);
scoped_ptr<LayerImpl> scroll_layer_scoped_ptr(
@@ -449,8 +431,8 @@ TEST_F(LayerTreeHostCommonTest, TransformsAboutScrollOffset) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 20),
- true,
false);
+
scoped_ptr<LayerImpl> clip_layer_scoped_ptr(
LayerImpl::Create(host_impl.active_tree(), 4));
LayerImpl* clip_layer = clip_layer_scoped_ptr.get();
@@ -474,7 +456,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsAboutScrollOffset) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(3, 4),
- true,
false);
root->AddChild(clip_layer_scoped_ptr.Pass());
@@ -500,7 +481,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsAboutScrollOffset) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 20),
- true,
false);
ExecuteCalculateDrawProperties(
root.get(), kDeviceScale, kPageScale, scroll_layer->parent());
@@ -534,7 +514,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSimpleHierarchy) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(1, 2),
- true,
false);
// Case 1: parent's anchor point should not affect child or grand_child.
@@ -544,7 +523,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSimpleHierarchy) {
gfx::PointF(0.25f, 0.25f),
gfx::PointF(),
gfx::Size(10, 12),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
identity_matrix,
@@ -552,7 +530,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSimpleHierarchy) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(16, 18),
- true,
false);
SetLayerPropertiesForTesting(grand_child.get(),
identity_matrix,
@@ -560,7 +537,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSimpleHierarchy) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(76, 78),
- true,
false);
ExecuteCalculateDrawProperties(root.get());
EXPECT_TRANSFORMATION_MATRIX_EQ(identity_matrix, child->draw_transform());
@@ -580,7 +556,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSimpleHierarchy) {
gfx::PointF(0.25f, 0.25f),
gfx::PointF(0.f, 1.2f),
gfx::Size(10, 12),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
identity_matrix,
@@ -588,7 +563,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSimpleHierarchy) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(16, 18),
- true,
false);
SetLayerPropertiesForTesting(grand_child.get(),
identity_matrix,
@@ -596,7 +570,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSimpleHierarchy) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(76, 78),
- true,
false);
ExecuteCalculateDrawProperties(root.get());
EXPECT_TRANSFORMATION_MATRIX_EQ(parent_position_transform,
@@ -622,7 +595,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSimpleHierarchy) {
gfx::PointF(0.25f, 0.25f),
gfx::PointF(),
gfx::Size(10, 12),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
identity_matrix,
@@ -630,7 +602,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSimpleHierarchy) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(16, 18),
- true,
false);
SetLayerPropertiesForTesting(grand_child.get(),
identity_matrix,
@@ -638,7 +609,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSimpleHierarchy) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(76, 78),
- true,
false);
ExecuteCalculateDrawProperties(root.get());
EXPECT_TRANSFORMATION_MATRIX_EQ(parent_composite_transform,
@@ -671,7 +641,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSimpleHierarchy) {
gfx::PointF(0.25f, 0.25f),
gfx::PointF(),
gfx::Size(10, 12),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
identity_matrix,
@@ -679,7 +648,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSimpleHierarchy) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(16, 18),
- true,
false);
SetLayerPropertiesForTesting(grand_child.get(),
identity_matrix,
@@ -687,7 +655,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSimpleHierarchy) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(76, 78),
- true,
false);
ExecuteCalculateDrawProperties(root.get());
EXPECT_TRANSFORMATION_MATRIX_EQ(parent_composite_transform,
@@ -707,7 +674,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSimpleHierarchy) {
gfx::PointF(0.25f, 0.25f),
gfx::PointF(),
gfx::Size(10, 12),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
identity_matrix,
@@ -715,7 +681,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSimpleHierarchy) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(16, 18),
- false,
true);
SetLayerPropertiesForTesting(grand_child.get(),
identity_matrix,
@@ -723,8 +688,7 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSimpleHierarchy) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(76, 78),
- true,
- true);
+ false);
ExecuteCalculateDrawProperties(root.get());
EXPECT_TRANSFORMATION_MATRIX_EQ(parent_composite_transform,
child->draw_transform());
@@ -757,7 +721,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSingleRenderSurface) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(1, 2),
- true,
false);
// Child is set up so that a new render surface should be created.
@@ -793,7 +756,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSingleRenderSurface) {
gfx::PointF(0.25f, 0.25f),
gfx::PointF(),
gfx::Size(100, 120),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
identity_matrix,
@@ -801,7 +763,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSingleRenderSurface) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(16, 18),
- true,
false);
SetLayerPropertiesForTesting(grand_child.get(),
identity_matrix,
@@ -809,7 +770,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForSingleRenderSurface) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(8, 10),
- true,
false);
ExecuteCalculateDrawProperties(root.get());
@@ -863,7 +823,6 @@ TEST_F(LayerTreeHostCommonTest, SublayerTransformWithAnchorPoint) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(1, 2),
- true,
false);
SetLayerPropertiesForTesting(parent.get(),
identity_matrix,
@@ -871,7 +830,6 @@ TEST_F(LayerTreeHostCommonTest, SublayerTransformWithAnchorPoint) {
parent_anchor_point,
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
identity_matrix,
@@ -879,7 +837,6 @@ TEST_F(LayerTreeHostCommonTest, SublayerTransformWithAnchorPoint) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
ExecuteCalculateDrawProperties(root.get());
@@ -914,7 +871,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForReplica) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(1, 2),
- true,
false);
// Child is set up so that a new render surface should be created.
@@ -951,7 +907,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForReplica) {
gfx::PointF(0.25f, 0.25f),
gfx::PointF(),
gfx::Size(10, 12),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
identity_matrix,
@@ -959,7 +914,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForReplica) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(16, 18),
- true,
false);
SetLayerPropertiesForTesting(grand_child.get(),
identity_matrix,
@@ -967,7 +921,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForReplica) {
gfx::PointF(),
gfx::PointF(-0.5f, -0.5f),
gfx::Size(1, 1),
- true,
false);
SetLayerPropertiesForTesting(child_replica.get(),
replica_layer_transform,
@@ -975,7 +928,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForReplica) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(),
- true,
false);
ExecuteCalculateDrawProperties(root.get());
@@ -987,8 +939,7 @@ TEST_F(LayerTreeHostCommonTest, TransformsForReplica) {
replica_composite_transform,
child->render_target()->render_surface()->replica_draw_transform());
EXPECT_TRANSFORMATION_MATRIX_EQ(replica_composite_transform,
- child->render_target()
- ->render_surface()
+ child->render_target()->render_surface()
->replica_screen_space_transform());
}
@@ -1048,7 +999,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForRenderSurfaceHierarchy) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(1, 2),
- true,
false);
// All layers in the tree are initialized with an anchor at .25 and a size of
@@ -1107,7 +1057,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForRenderSurfaceHierarchy) {
gfx::PointF(0.25f, 0.f),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(render_surface1.get(),
layer_transform,
@@ -1115,7 +1064,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForRenderSurfaceHierarchy) {
gfx::PointF(0.25f, 0.f),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(render_surface2.get(),
layer_transform,
@@ -1123,7 +1071,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForRenderSurfaceHierarchy) {
gfx::PointF(0.25f, 0.f),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(child_of_root.get(),
layer_transform,
@@ -1131,7 +1078,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForRenderSurfaceHierarchy) {
gfx::PointF(0.25f, 0.f),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(child_of_rs1.get(),
layer_transform,
@@ -1139,7 +1085,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForRenderSurfaceHierarchy) {
gfx::PointF(0.25f, 0.f),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(child_of_rs2.get(),
layer_transform,
@@ -1147,7 +1092,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForRenderSurfaceHierarchy) {
gfx::PointF(0.25f, 0.f),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(grand_child_of_root.get(),
layer_transform,
@@ -1155,7 +1099,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForRenderSurfaceHierarchy) {
gfx::PointF(0.25f, 0.f),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(grand_child_of_rs1.get(),
layer_transform,
@@ -1163,7 +1106,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForRenderSurfaceHierarchy) {
gfx::PointF(0.25f, 0.f),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(grand_child_of_rs2.get(),
layer_transform,
@@ -1171,7 +1113,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForRenderSurfaceHierarchy) {
gfx::PointF(0.25f, 0.f),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(replica_of_rs1.get(),
replica_layer_transform,
@@ -1179,7 +1120,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForRenderSurfaceHierarchy) {
gfx::PointF(0.25f, 0.f),
gfx::PointF(),
gfx::Size(),
- true,
false);
SetLayerPropertiesForTesting(replica_of_rs2.get(),
replica_layer_transform,
@@ -1187,7 +1127,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForRenderSurfaceHierarchy) {
gfx::PointF(0.25f, 0.f),
gfx::PointF(),
gfx::Size(),
- true,
false);
ExecuteCalculateDrawProperties(root.get());
@@ -1332,7 +1271,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForFlatteningLayer) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
rotation_about_y_axis,
@@ -1340,7 +1278,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForFlatteningLayer) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(grand_child.get(),
rotation_about_y_axis,
@@ -1348,7 +1285,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForFlatteningLayer) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
root->AddChild(child);
@@ -1359,9 +1295,9 @@ TEST_F(LayerTreeHostCommonTest, TransformsForFlatteningLayer) {
host->SetRootLayer(root);
// No layers in this test should preserve 3d.
- ASSERT_TRUE(root->should_flatten_transform());
- ASSERT_TRUE(child->should_flatten_transform());
- ASSERT_TRUE(grand_child->should_flatten_transform());
+ ASSERT_FALSE(root->preserves_3d());
+ ASSERT_FALSE(child->preserves_3d());
+ ASSERT_FALSE(grand_child->preserves_3d());
gfx::Transform expected_child_draw_transform = rotation_about_y_axis;
gfx::Transform expected_child_screen_space_transform = rotation_about_y_axis;
@@ -1414,7 +1350,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForDegenerateIntermediateLayer) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
identity_matrix,
@@ -1422,7 +1357,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForDegenerateIntermediateLayer) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 0),
- true,
false);
SetLayerPropertiesForTesting(grand_child.get(),
identity_matrix,
@@ -1430,7 +1364,6 @@ TEST_F(LayerTreeHostCommonTest, TransformsForDegenerateIntermediateLayer) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
root->AddChild(child);
@@ -1469,7 +1402,6 @@ TEST_F(LayerTreeHostCommonTest, TransformAboveRootLayer) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(20, 20),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
identity_matrix,
@@ -1477,7 +1409,6 @@ TEST_F(LayerTreeHostCommonTest, TransformAboveRootLayer) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(20, 20),
- true,
false);
gfx::Transform translate;
@@ -1604,6 +1535,7 @@ TEST_F(LayerTreeHostCommonTest,
scoped_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create();
host->SetRootLayer(parent);
+
const gfx::Transform identity_matrix;
SetLayerPropertiesForTesting(parent.get(),
identity_matrix,
@@ -1611,7 +1543,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(render_surface1.get(),
identity_matrix,
@@ -1619,7 +1550,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
identity_matrix,
@@ -1627,7 +1557,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(30.f, 30.f),
gfx::Size(10, 10),
- true,
false);
parent->AddChild(render_surface1);
@@ -1669,7 +1598,6 @@ TEST_F(LayerTreeHostCommonTest, RenderSurfaceListForTransparentChild) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
identity_matrix,
@@ -1677,7 +1605,6 @@ TEST_F(LayerTreeHostCommonTest, RenderSurfaceListForTransparentChild) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
parent->AddChild(render_surface1);
@@ -1718,7 +1645,6 @@ TEST_F(LayerTreeHostCommonTest, ForceRenderSurface) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(render_surface1.get(),
identity_matrix,
@@ -1726,7 +1652,6 @@ TEST_F(LayerTreeHostCommonTest, ForceRenderSurface) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
identity_matrix,
@@ -1734,7 +1659,6 @@ TEST_F(LayerTreeHostCommonTest, ForceRenderSurface) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
parent->AddChild(render_surface1);
@@ -1815,7 +1739,6 @@ TEST_F(LayerTreeHostCommonTest, ClipRectCullsRenderSurfaces) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(500, 500),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
identity_matrix,
@@ -1823,7 +1746,6 @@ TEST_F(LayerTreeHostCommonTest, ClipRectCullsRenderSurfaces) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(20, 20),
- true,
false);
SetLayerPropertiesForTesting(grand_child.get(),
identity_matrix,
@@ -1831,7 +1753,6 @@ TEST_F(LayerTreeHostCommonTest, ClipRectCullsRenderSurfaces) {
gfx::PointF(),
gfx::PointF(45.f, 45.f),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(great_grand_child.get(),
identity_matrix,
@@ -1839,7 +1760,6 @@ TEST_F(LayerTreeHostCommonTest, ClipRectCullsRenderSurfaces) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(leaf_node1.get(),
identity_matrix,
@@ -1847,7 +1767,6 @@ TEST_F(LayerTreeHostCommonTest, ClipRectCullsRenderSurfaces) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(500, 500),
- true,
false);
SetLayerPropertiesForTesting(leaf_node2.get(),
identity_matrix,
@@ -1855,7 +1774,6 @@ TEST_F(LayerTreeHostCommonTest, ClipRectCullsRenderSurfaces) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(20, 20),
- true,
false);
child->SetMasksToBounds(true);
@@ -1913,7 +1831,6 @@ TEST_F(LayerTreeHostCommonTest, ClipRectCullsSurfaceWithoutVisibleContent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
identity_matrix,
@@ -1921,7 +1838,6 @@ TEST_F(LayerTreeHostCommonTest, ClipRectCullsSurfaceWithoutVisibleContent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(20, 20),
- true,
false);
SetLayerPropertiesForTesting(grand_child.get(),
identity_matrix,
@@ -1929,7 +1845,6 @@ TEST_F(LayerTreeHostCommonTest, ClipRectCullsSurfaceWithoutVisibleContent) {
gfx::PointF(),
gfx::PointF(200.f, 200.f),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(leaf_node.get(),
identity_matrix,
@@ -1937,7 +1852,6 @@ TEST_F(LayerTreeHostCommonTest, ClipRectCullsSurfaceWithoutVisibleContent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
parent->SetMasksToBounds(true);
@@ -2021,7 +1935,6 @@ TEST_F(LayerTreeHostCommonTest, IsClippedIsSetCorrectly) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(parent.get(),
identity_matrix,
@@ -2029,7 +1942,6 @@ TEST_F(LayerTreeHostCommonTest, IsClippedIsSetCorrectly) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(child1.get(),
identity_matrix,
@@ -2037,7 +1949,6 @@ TEST_F(LayerTreeHostCommonTest, IsClippedIsSetCorrectly) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(child2.get(),
identity_matrix,
@@ -2045,7 +1956,6 @@ TEST_F(LayerTreeHostCommonTest, IsClippedIsSetCorrectly) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(grand_child.get(),
identity_matrix,
@@ -2053,7 +1963,6 @@ TEST_F(LayerTreeHostCommonTest, IsClippedIsSetCorrectly) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(leaf_node1.get(),
identity_matrix,
@@ -2061,7 +1970,6 @@ TEST_F(LayerTreeHostCommonTest, IsClippedIsSetCorrectly) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(leaf_node2.get(),
identity_matrix,
@@ -2069,7 +1977,6 @@ TEST_F(LayerTreeHostCommonTest, IsClippedIsSetCorrectly) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
// Case 1: nothing is clipped except the root render surface.
@@ -2184,7 +2091,6 @@ TEST_F(LayerTreeHostCommonTest, DrawableContentRectForLayers) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(500, 500),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
identity_matrix,
@@ -2192,7 +2098,6 @@ TEST_F(LayerTreeHostCommonTest, DrawableContentRectForLayers) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(20, 20),
- true,
false);
SetLayerPropertiesForTesting(grand_child1.get(),
identity_matrix,
@@ -2200,7 +2105,6 @@ TEST_F(LayerTreeHostCommonTest, DrawableContentRectForLayers) {
gfx::PointF(),
gfx::PointF(5.f, 5.f),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(grand_child2.get(),
identity_matrix,
@@ -2208,7 +2112,6 @@ TEST_F(LayerTreeHostCommonTest, DrawableContentRectForLayers) {
gfx::PointF(),
gfx::PointF(15.f, 15.f),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(grand_child3.get(),
identity_matrix,
@@ -2216,7 +2119,6 @@ TEST_F(LayerTreeHostCommonTest, DrawableContentRectForLayers) {
gfx::PointF(),
gfx::PointF(15.f, 15.f),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(grand_child4.get(),
identity_matrix,
@@ -2224,7 +2126,6 @@ TEST_F(LayerTreeHostCommonTest, DrawableContentRectForLayers) {
gfx::PointF(),
gfx::PointF(45.f, 45.f),
gfx::Size(10, 10),
- true,
false);
child->SetMasksToBounds(true);
@@ -2298,7 +2199,6 @@ TEST_F(LayerTreeHostCommonTest, ClipRectIsPropagatedCorrectlyToSurfaces) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(500, 500),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
identity_matrix,
@@ -2306,7 +2206,6 @@ TEST_F(LayerTreeHostCommonTest, ClipRectIsPropagatedCorrectlyToSurfaces) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(20, 20),
- true,
false);
SetLayerPropertiesForTesting(grand_child1.get(),
identity_matrix,
@@ -2314,7 +2213,6 @@ TEST_F(LayerTreeHostCommonTest, ClipRectIsPropagatedCorrectlyToSurfaces) {
gfx::PointF(),
gfx::PointF(5.f, 5.f),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(grand_child2.get(),
identity_matrix,
@@ -2322,7 +2220,6 @@ TEST_F(LayerTreeHostCommonTest, ClipRectIsPropagatedCorrectlyToSurfaces) {
gfx::PointF(),
gfx::PointF(15.f, 15.f),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(grand_child3.get(),
identity_matrix,
@@ -2330,7 +2227,6 @@ TEST_F(LayerTreeHostCommonTest, ClipRectIsPropagatedCorrectlyToSurfaces) {
gfx::PointF(),
gfx::PointF(15.f, 15.f),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(grand_child4.get(),
identity_matrix,
@@ -2338,7 +2234,6 @@ TEST_F(LayerTreeHostCommonTest, ClipRectIsPropagatedCorrectlyToSurfaces) {
gfx::PointF(),
gfx::PointF(45.f, 45.f),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(leaf_node1.get(),
identity_matrix,
@@ -2346,7 +2241,6 @@ TEST_F(LayerTreeHostCommonTest, ClipRectIsPropagatedCorrectlyToSurfaces) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(leaf_node2.get(),
identity_matrix,
@@ -2354,7 +2248,6 @@ TEST_F(LayerTreeHostCommonTest, ClipRectIsPropagatedCorrectlyToSurfaces) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(leaf_node3.get(),
identity_matrix,
@@ -2362,7 +2255,6 @@ TEST_F(LayerTreeHostCommonTest, ClipRectIsPropagatedCorrectlyToSurfaces) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(leaf_node4.get(),
identity_matrix,
@@ -2370,7 +2262,6 @@ TEST_F(LayerTreeHostCommonTest, ClipRectIsPropagatedCorrectlyToSurfaces) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
child->SetMasksToBounds(true);
@@ -2450,7 +2341,6 @@ TEST_F(LayerTreeHostCommonTest, AnimationsForRenderSurfaceHierarchy) {
gfx::PointF(0.25f, 0.f),
gfx::PointF(2.5f, 0.f),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(render_surface1.get(),
layer_transform,
@@ -2458,7 +2348,6 @@ TEST_F(LayerTreeHostCommonTest, AnimationsForRenderSurfaceHierarchy) {
gfx::PointF(0.25f, 0.f),
gfx::PointF(2.5f, 0.f),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(render_surface2.get(),
layer_transform,
@@ -2466,7 +2355,6 @@ TEST_F(LayerTreeHostCommonTest, AnimationsForRenderSurfaceHierarchy) {
gfx::PointF(0.25f, 0.f),
gfx::PointF(2.5f, 0.f),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(child_of_root.get(),
layer_transform,
@@ -2474,7 +2362,6 @@ TEST_F(LayerTreeHostCommonTest, AnimationsForRenderSurfaceHierarchy) {
gfx::PointF(0.25f, 0.f),
gfx::PointF(2.5f, 0.f),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(child_of_rs1.get(),
layer_transform,
@@ -2482,7 +2369,6 @@ TEST_F(LayerTreeHostCommonTest, AnimationsForRenderSurfaceHierarchy) {
gfx::PointF(0.25f, 0.f),
gfx::PointF(2.5f, 0.f),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(child_of_rs2.get(),
layer_transform,
@@ -2490,7 +2376,6 @@ TEST_F(LayerTreeHostCommonTest, AnimationsForRenderSurfaceHierarchy) {
gfx::PointF(0.25f, 0.f),
gfx::PointF(2.5f, 0.f),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(grand_child_of_root.get(),
layer_transform,
@@ -2498,7 +2383,6 @@ TEST_F(LayerTreeHostCommonTest, AnimationsForRenderSurfaceHierarchy) {
gfx::PointF(0.25f, 0.f),
gfx::PointF(2.5f, 0.f),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(grand_child_of_rs1.get(),
layer_transform,
@@ -2506,7 +2390,6 @@ TEST_F(LayerTreeHostCommonTest, AnimationsForRenderSurfaceHierarchy) {
gfx::PointF(0.25f, 0.f),
gfx::PointF(2.5f, 0.f),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(grand_child_of_rs2.get(),
layer_transform,
@@ -2514,7 +2397,6 @@ TEST_F(LayerTreeHostCommonTest, AnimationsForRenderSurfaceHierarchy) {
gfx::PointF(0.25f, 0.f),
gfx::PointF(2.5f, 0.f),
gfx::Size(10, 10),
- true,
false);
// Put an animated opacity on the render surface.
@@ -2941,7 +2823,6 @@ TEST_F(LayerTreeHostCommonTest, DrawableAndVisibleContentRectsForSimpleLayers) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(child1.get(),
identity_matrix,
@@ -2949,7 +2830,6 @@ TEST_F(LayerTreeHostCommonTest, DrawableAndVisibleContentRectsForSimpleLayers) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(child2.get(),
identity_matrix,
@@ -2957,7 +2837,6 @@ TEST_F(LayerTreeHostCommonTest, DrawableAndVisibleContentRectsForSimpleLayers) {
gfx::PointF(),
gfx::PointF(75.f, 75.f),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(child3.get(),
identity_matrix,
@@ -2965,7 +2844,6 @@ TEST_F(LayerTreeHostCommonTest, DrawableAndVisibleContentRectsForSimpleLayers) {
gfx::PointF(),
gfx::PointF(125.f, 125.f),
gfx::Size(50, 50),
- true,
false);
ExecuteCalculateDrawProperties(root.get());
@@ -3013,7 +2891,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
identity_matrix,
@@ -3021,7 +2898,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(grand_child1.get(),
identity_matrix,
@@ -3029,7 +2905,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(5.f, 5.f),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(grand_child2.get(),
identity_matrix,
@@ -3037,7 +2912,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(75.f, 75.f),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(grand_child3.get(),
identity_matrix,
@@ -3045,7 +2919,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(125.f, 125.f),
gfx::Size(50, 50),
- true,
false);
child->SetMasksToBounds(true);
@@ -3099,7 +2972,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(render_surface1.get(),
identity_matrix,
@@ -3107,7 +2979,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(3, 4),
- true,
false);
SetLayerPropertiesForTesting(child1.get(),
identity_matrix,
@@ -3115,7 +2986,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(5.f, 5.f),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(child2.get(),
identity_matrix,
@@ -3123,7 +2993,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(75.f, 75.f),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(child3.get(),
identity_matrix,
@@ -3131,7 +3000,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(125.f, 125.f),
gfx::Size(50, 50),
- true,
false);
render_surface1->SetForceRenderSurface(true);
@@ -3184,7 +3052,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
uninvertible_matrix,
@@ -3192,7 +3059,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(5.f, 5.f),
gfx::Size(50, 50),
- true,
false);
ExecuteCalculateDrawProperties(root.get());
@@ -3214,7 +3080,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(5.f, 5.f),
gfx::Size(50, 50),
- true,
false);
ExecuteCalculateDrawProperties(root.get());
@@ -3236,7 +3101,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(5.f, 5.f),
gfx::Size(50, 50),
- true,
false);
ExecuteCalculateDrawProperties(root.get());
@@ -3270,7 +3134,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(render_surface1.get(),
identity_matrix,
@@ -3278,7 +3141,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(3, 4),
- true,
false);
SetLayerPropertiesForTesting(child1.get(),
identity_matrix,
@@ -3286,7 +3148,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(5.f, 5.f),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(child2.get(),
identity_matrix,
@@ -3294,7 +3155,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(75.f, 75.f),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(child3.get(),
identity_matrix,
@@ -3302,7 +3162,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(125.f, 125.f),
gfx::Size(50, 50),
- true,
false);
root->SetMasksToBounds(true);
@@ -3365,7 +3224,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(render_surface1.get(),
identity_matrix,
@@ -3373,7 +3231,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(3, 4),
- true,
false);
SetLayerPropertiesForTesting(render_surface2.get(),
identity_matrix,
@@ -3381,7 +3238,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(7, 13),
- true,
false);
SetLayerPropertiesForTesting(child1.get(),
identity_matrix,
@@ -3389,7 +3245,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(5.f, 5.f),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(child2.get(),
identity_matrix,
@@ -3397,7 +3252,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(75.f, 75.f),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(child3.get(),
identity_matrix,
@@ -3405,7 +3259,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(125.f, 125.f),
gfx::Size(50, 50),
- true,
false);
root->SetMasksToBounds(true);
@@ -3473,7 +3326,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(render_surface1.get(),
identity_matrix,
@@ -3481,7 +3333,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(3, 4),
- true,
false);
SetLayerPropertiesForTesting(child1.get(),
child_rotation,
@@ -3489,7 +3340,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(0.5f, 0.5f),
gfx::PointF(25.f, 25.f),
gfx::Size(50, 50),
- true,
false);
render_surface1->SetForceRenderSurface(true);
@@ -3547,7 +3397,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(render_surface1.get(),
identity_matrix,
@@ -3555,7 +3404,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(3, 4),
- true,
false);
SetLayerPropertiesForTesting(child1.get(),
child_rotation,
@@ -3563,7 +3411,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(0.5f, 0.5f),
gfx::PointF(25.f, 25.f),
gfx::Size(50, 50),
- true,
false);
root->SetMasksToBounds(true);
@@ -3622,7 +3469,6 @@ TEST_F(LayerTreeHostCommonTest, DrawableAndVisibleContentRectsInHighDPI) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(render_surface1.get(),
identity_matrix,
@@ -3630,7 +3476,6 @@ TEST_F(LayerTreeHostCommonTest, DrawableAndVisibleContentRectsInHighDPI) {
gfx::PointF(),
gfx::PointF(5.f, 5.f),
gfx::Size(3, 4),
- true,
false);
SetLayerPropertiesForTesting(render_surface2.get(),
identity_matrix,
@@ -3638,7 +3483,6 @@ TEST_F(LayerTreeHostCommonTest, DrawableAndVisibleContentRectsInHighDPI) {
gfx::PointF(),
gfx::PointF(5.f, 5.f),
gfx::Size(7, 13),
- true,
false);
SetLayerPropertiesForTesting(child1.get(),
identity_matrix,
@@ -3646,7 +3490,6 @@ TEST_F(LayerTreeHostCommonTest, DrawableAndVisibleContentRectsInHighDPI) {
gfx::PointF(),
gfx::PointF(5.f, 5.f),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(child2.get(),
identity_matrix,
@@ -3654,7 +3497,6 @@ TEST_F(LayerTreeHostCommonTest, DrawableAndVisibleContentRectsInHighDPI) {
gfx::PointF(),
gfx::PointF(75.f, 75.f),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(child3.get(),
identity_matrix,
@@ -3662,7 +3504,6 @@ TEST_F(LayerTreeHostCommonTest, DrawableAndVisibleContentRectsInHighDPI) {
gfx::PointF(),
gfx::PointF(125.f, 125.f),
gfx::Size(50, 50),
- true,
false);
float device_scale_factor = 2.f;
@@ -3776,7 +3617,6 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithoutPreserves3d) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(front_facing_child.get(),
identity_matrix,
@@ -3784,7 +3624,6 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithoutPreserves3d) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(back_facing_child.get(),
backface_matrix,
@@ -3792,7 +3631,6 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithoutPreserves3d) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(front_facing_surface.get(),
identity_matrix,
@@ -3800,7 +3638,6 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithoutPreserves3d) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(back_facing_surface.get(),
backface_matrix,
@@ -3808,7 +3645,6 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithoutPreserves3d) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(front_facing_child_of_front_facing_surface.get(),
identity_matrix,
@@ -3816,7 +3652,6 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithoutPreserves3d) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(back_facing_child_of_front_facing_surface.get(),
backface_matrix,
@@ -3824,7 +3659,6 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithoutPreserves3d) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(front_facing_child_of_back_facing_surface.get(),
identity_matrix,
@@ -3832,7 +3666,6 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithoutPreserves3d) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(back_facing_child_of_back_facing_surface.get(),
backface_matrix,
@@ -3840,7 +3673,6 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithoutPreserves3d) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
RenderSurfaceLayerList render_surface_layer_list;
@@ -3873,22 +3705,13 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithoutPreserves3d) {
render_surface_layer_list.at(0)->render_surface()->layer_list().size());
EXPECT_EQ(front_facing_child->id(),
render_surface_layer_list.at(0)
- ->render_surface()
- ->layer_list()
- .at(0)
- ->id());
+ ->render_surface()->layer_list().at(0)->id());
EXPECT_EQ(front_facing_surface->id(),
render_surface_layer_list.at(0)
- ->render_surface()
- ->layer_list()
- .at(1)
- ->id());
+ ->render_surface()->layer_list().at(1)->id());
EXPECT_EQ(back_facing_surface->id(),
render_surface_layer_list.at(0)
- ->render_surface()
- ->layer_list()
- .at(2)
- ->id());
+ ->render_surface()->layer_list().at(2)->id());
// Verify front_facing_surface's layer list.
ASSERT_EQ(
@@ -3896,16 +3719,10 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithoutPreserves3d) {
render_surface_layer_list.at(1)->render_surface()->layer_list().size());
EXPECT_EQ(front_facing_surface->id(),
render_surface_layer_list.at(1)
- ->render_surface()
- ->layer_list()
- .at(0)
- ->id());
+ ->render_surface()->layer_list().at(0)->id());
EXPECT_EQ(front_facing_child_of_front_facing_surface->id(),
render_surface_layer_list.at(1)
- ->render_surface()
- ->layer_list()
- .at(1)
- ->id());
+ ->render_surface()->layer_list().at(1)->id());
// Verify back_facing_surface's layer list; its own layer should be culled
// from the surface list.
@@ -3914,10 +3731,7 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithoutPreserves3d) {
render_surface_layer_list.at(2)->render_surface()->layer_list().size());
EXPECT_EQ(front_facing_child_of_back_facing_surface->id(),
render_surface_layer_list.at(2)
- ->render_surface()
- ->layer_list()
- .at(0)
- ->id());
+ ->render_surface()->layer_list().at(0)->id());
}
TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithPreserves3d) {
@@ -3995,7 +3809,6 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithPreserves3d) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false); // parent transform style is flat.
SetLayerPropertiesForTesting(front_facing_child.get(),
identity_matrix,
@@ -4003,7 +3816,6 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithPreserves3d) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(back_facing_child.get(),
backface_matrix,
@@ -4011,58 +3823,51 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithPreserves3d) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
- // surface transform style is preserve-3d.
- SetLayerPropertiesForTesting(front_facing_surface.get(),
- identity_matrix,
- identity_matrix,
- gfx::PointF(),
- gfx::PointF(),
- gfx::Size(100, 100),
- false,
- true);
- // surface transform style is preserve-3d.
- SetLayerPropertiesForTesting(back_facing_surface.get(),
- backface_matrix,
- identity_matrix,
- gfx::PointF(),
- gfx::PointF(),
- gfx::Size(100, 100),
- false,
- true);
+ SetLayerPropertiesForTesting(
+ front_facing_surface.get(),
+ identity_matrix,
+ identity_matrix,
+ gfx::PointF(),
+ gfx::PointF(),
+ gfx::Size(100, 100),
+ true); // surface transform style is preserve-3d.
+ SetLayerPropertiesForTesting(
+ back_facing_surface.get(),
+ backface_matrix,
+ identity_matrix,
+ gfx::PointF(),
+ gfx::PointF(),
+ gfx::Size(100, 100),
+ true); // surface transform style is preserve-3d.
SetLayerPropertiesForTesting(front_facing_child_of_front_facing_surface.get(),
identity_matrix,
identity_matrix,
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
- true);
+ false);
SetLayerPropertiesForTesting(back_facing_child_of_front_facing_surface.get(),
backface_matrix,
identity_matrix,
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
- true);
+ false);
SetLayerPropertiesForTesting(front_facing_child_of_back_facing_surface.get(),
identity_matrix,
identity_matrix,
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
- true);
+ false);
SetLayerPropertiesForTesting(back_facing_child_of_back_facing_surface.get(),
backface_matrix,
identity_matrix,
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
- true);
+ false);
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
@@ -4166,7 +3971,6 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithAnimatingTransforms) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
backface_matrix,
@@ -4174,7 +3978,6 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithAnimatingTransforms) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(animating_surface.get(),
backface_matrix,
@@ -4182,7 +3985,6 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithAnimatingTransforms) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(child_of_animating_surface.get(),
backface_matrix,
@@ -4190,7 +3992,6 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithAnimatingTransforms) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(animating_child.get(),
backface_matrix,
@@ -4198,7 +3999,6 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithAnimatingTransforms) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(child2.get(),
identity_matrix,
@@ -4206,7 +4006,6 @@ TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithAnimatingTransforms) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
RenderSurfaceLayerList render_surface_layer_list;
@@ -4305,31 +4104,27 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- false,
- true); // parent transform style is preserve3d.
+ true); // parent transform style is preserve3d.
SetLayerPropertiesForTesting(front_facing_surface.get(),
identity_matrix,
identity_matrix,
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
- true); // surface transform style is flat.
+ false); // surface transform style is flat.
SetLayerPropertiesForTesting(back_facing_surface.get(),
backface_matrix,
identity_matrix,
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
- true); // surface transform style is flat.
+ false); // surface transform style is flat.
SetLayerPropertiesForTesting(child1.get(),
identity_matrix,
identity_matrix,
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(child2.get(),
identity_matrix,
@@ -4337,12 +4132,8 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
- front_facing_surface->SetIs3dSorted(true);
- back_facing_surface->SetIs3dSorted(true);
-
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
parent.get(), parent->bounds(), &render_surface_layer_list);
@@ -4415,7 +4206,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForSingleLayer) {
anchor,
position,
bounds,
- true,
false);
root->SetDrawsContent(true);
@@ -4472,7 +4262,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForSingleLayerAndHud) {
anchor,
position,
bounds,
- true,
false);
root->SetDrawsContent(true);
@@ -4484,7 +4273,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForSingleLayerAndHud) {
anchor,
position,
hud_bounds,
- true,
false);
hud->SetDrawsContent(true);
@@ -4550,7 +4338,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForUninvertibleTransform) {
anchor,
position,
bounds,
- true,
false);
root->SetDrawsContent(true);
@@ -4622,7 +4409,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForSinglePositionedLayer) {
anchor,
position,
bounds,
- true,
false);
root->SetDrawsContent(true);
@@ -4683,7 +4469,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForSingleRotatedLayer) {
anchor,
position,
bounds,
- true,
false);
root->SetDrawsContent(true);
@@ -4757,7 +4542,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForSinglePerspectiveLayer) {
anchor,
position,
bounds,
- true,
false);
root->SetDrawsContent(true);
@@ -4823,7 +4607,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForSingleLayerWithScaledContents) {
anchor,
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
{
gfx::PointF position(25.f, 25.f);
@@ -4836,7 +4619,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForSingleLayerWithScaledContents) {
anchor,
position,
bounds,
- true,
false);
// override content bounds and contents scale
@@ -4909,7 +4691,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForSimpleClippedLayer) {
anchor,
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
{
scoped_ptr<LayerImpl> clipping_layer =
@@ -4924,7 +4705,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForSimpleClippedLayer) {
anchor,
position,
bounds,
- true,
false);
clipping_layer->SetMasksToBounds(true);
@@ -4938,7 +4718,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForSimpleClippedLayer) {
anchor,
position,
bounds,
- true,
false);
child->SetDrawsContent(true);
clipping_layer->AddChild(child.Pass());
@@ -5010,7 +4789,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForMultiClippedRotatedLayer) {
anchor,
position,
bounds,
- true,
false);
root->SetMasksToBounds(true);
{
@@ -5029,7 +4807,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForMultiClippedRotatedLayer) {
anchor,
position,
bounds,
- true,
false);
child->SetMasksToBounds(true);
@@ -5047,7 +4824,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForMultiClippedRotatedLayer) {
anchor,
position,
bounds,
- true,
false);
grand_child->SetMasksToBounds(true);
@@ -5068,7 +4844,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForMultiClippedRotatedLayer) {
anchor,
position,
bounds,
- true,
false);
rotated_leaf->SetDrawsContent(true);
@@ -5162,7 +4937,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForNonClippingIntermediateLayer) {
anchor,
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
{
scoped_ptr<LayerImpl> intermediate_layer =
@@ -5177,7 +4951,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForNonClippingIntermediateLayer) {
anchor,
position,
bounds,
- true,
false);
// Sanity check the intermediate layer should not clip.
ASSERT_FALSE(intermediate_layer->masks_to_bounds());
@@ -5196,7 +4969,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForNonClippingIntermediateLayer) {
anchor,
position,
bounds,
- true,
false);
child->SetDrawsContent(true);
intermediate_layer->AddChild(child.Pass());
@@ -5254,7 +5026,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForMultipleLayers) {
anchor,
position,
bounds,
- true,
false);
root->SetDrawsContent(true);
{
@@ -5279,7 +5050,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForMultipleLayers) {
anchor,
position,
bounds,
- true,
false);
child1->SetDrawsContent(true);
@@ -5291,7 +5061,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForMultipleLayers) {
anchor,
position,
bounds,
- true,
false);
child2->SetDrawsContent(true);
@@ -5306,7 +5075,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForMultipleLayers) {
anchor,
position,
bounds,
- true,
false);
grand_child1->SetDrawsContent(true);
@@ -5405,7 +5173,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForMultipleLayerLists) {
anchor,
position,
bounds,
- true,
false);
root->SetDrawsContent(true);
{
@@ -5430,7 +5197,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForMultipleLayerLists) {
anchor,
position,
bounds,
- true,
false);
child1->SetDrawsContent(true);
child1->SetForceRenderSurface(true);
@@ -5443,7 +5209,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForMultipleLayerLists) {
anchor,
position,
bounds,
- true,
false);
child2->SetDrawsContent(true);
child2->SetForceRenderSurface(true);
@@ -5459,7 +5224,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForMultipleLayerLists) {
anchor,
position,
bounds,
- true,
false);
grand_child1->SetDrawsContent(true);
grand_child1->SetForceRenderSurface(true);
@@ -5564,7 +5328,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForEmptyLayers) {
anchor,
position,
bounds,
- true,
false);
root->SetDrawsContent(true);
@@ -5580,7 +5343,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForEmptyLayers) {
anchor,
position,
bounds,
- true,
false);
empty_layer->SetDrawsContent(false);
@@ -5599,7 +5361,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForEmptyLayers) {
anchor,
position,
bounds,
- true,
false);
test_layer->SetDrawsContent(false);
@@ -5620,7 +5381,6 @@ TEST_F(LayerTreeHostCommonTest, HitTestingForEmptyLayers) {
anchor,
position,
bounds,
- true,
false);
test_layer->SetDrawsContent(false);
@@ -5702,7 +5462,6 @@ TEST_F(LayerTreeHostCommonTest, HitCheckingTouchHandlerRegionsForSingleLayer) {
anchor,
position,
bounds,
- true,
false);
root->SetDrawsContent(true);
@@ -5794,7 +5553,6 @@ TEST_F(LayerTreeHostCommonTest,
anchor,
position,
bounds,
- true,
false);
root->SetDrawsContent(true);
root->SetTouchEventHandlerRegion(touch_handler_region);
@@ -5877,7 +5635,6 @@ TEST_F(LayerTreeHostCommonTest,
anchor,
position,
bounds,
- true,
false);
root->SetDrawsContent(true);
root->SetTouchEventHandlerRegion(touch_handler_region);
@@ -5958,7 +5715,6 @@ TEST_F(LayerTreeHostCommonTest,
anchor,
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
{
Region touch_handler_region(gfx::Rect(10, 10, 30, 30));
@@ -5972,7 +5728,6 @@ TEST_F(LayerTreeHostCommonTest,
anchor,
position,
bounds,
- true,
false);
// override content bounds and contents scale
@@ -6067,7 +5822,6 @@ TEST_F(LayerTreeHostCommonTest,
anchor,
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
{
Region touch_handler_region(gfx::Rect(10, 10, 30, 30));
@@ -6081,7 +5835,6 @@ TEST_F(LayerTreeHostCommonTest,
anchor,
position,
bounds,
- true,
false);
test_layer->SetDrawsContent(true);
@@ -6196,7 +5949,6 @@ TEST_F(LayerTreeHostCommonTest,
anchor,
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
{
scoped_ptr<LayerImpl> clipping_layer =
@@ -6211,7 +5963,6 @@ TEST_F(LayerTreeHostCommonTest,
anchor,
position,
bounds,
- true,
false);
clipping_layer->SetMasksToBounds(true);
@@ -6226,7 +5977,6 @@ TEST_F(LayerTreeHostCommonTest,
anchor,
position,
bounds,
- true,
false);
child->SetDrawsContent(true);
child->SetTouchEventHandlerRegion(touch_handler_region);
@@ -6299,7 +6049,6 @@ TEST_F(LayerTreeHostCommonTest,
anchor,
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
{
scoped_ptr<LayerImpl> touch_layer =
@@ -6314,7 +6063,6 @@ TEST_F(LayerTreeHostCommonTest,
anchor,
position,
bounds,
- true,
false);
touch_layer->SetDrawsContent(true);
touch_layer->SetTouchEventHandlerRegion(gfx::Rect(0, 0, 50, 50));
@@ -6334,7 +6082,6 @@ TEST_F(LayerTreeHostCommonTest,
anchor,
position,
bounds,
- true,
false);
notouch_layer->SetDrawsContent(true);
root->AddChild(notouch_layer.Pass());
@@ -6421,7 +6168,6 @@ TEST_F(LayerTreeHostCommonTest, LayerTransformsInHighDPI) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- false,
true);
scoped_refptr<ContentLayer> child = CreateDrawableContentLayer(&delegate);
@@ -6431,7 +6177,6 @@ TEST_F(LayerTreeHostCommonTest, LayerTransformsInHighDPI) {
gfx::PointF(),
gfx::PointF(2.f, 2.f),
gfx::Size(10, 10),
- false,
true);
scoped_refptr<ContentLayer> child_empty =
@@ -6442,7 +6187,6 @@ TEST_F(LayerTreeHostCommonTest, LayerTransformsInHighDPI) {
gfx::PointF(),
gfx::PointF(2.f, 2.f),
gfx::Size(),
- false,
true);
scoped_refptr<NoScaleContentLayer> child_no_scale =
@@ -6453,7 +6197,6 @@ TEST_F(LayerTreeHostCommonTest, LayerTransformsInHighDPI) {
gfx::PointF(),
gfx::PointF(2.f, 2.f),
gfx::Size(10, 10),
- false,
true);
parent->AddChild(child);
@@ -6569,7 +6312,6 @@ TEST_F(LayerTreeHostCommonTest, SurfaceLayerTransformsInHighDPI) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- false,
true);
scoped_refptr<ContentLayer> perspective_surface =
@@ -6580,7 +6322,6 @@ TEST_F(LayerTreeHostCommonTest, SurfaceLayerTransformsInHighDPI) {
gfx::PointF(),
gfx::PointF(2.f, 2.f),
gfx::Size(10, 10),
- false,
true);
scoped_refptr<ContentLayer> scale_surface =
@@ -6591,7 +6332,6 @@ TEST_F(LayerTreeHostCommonTest, SurfaceLayerTransformsInHighDPI) {
gfx::PointF(),
gfx::PointF(2.f, 2.f),
gfx::Size(10, 10),
- false,
true);
perspective_surface->SetForceRenderSurface(true);
@@ -6676,7 +6416,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(133, 133),
- false,
true);
scoped_refptr<ContentLayer> child = CreateDrawableContentLayer(&delegate);
@@ -6686,7 +6425,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(13, 13),
- false,
true);
scoped_refptr<NoScaleContentLayer> child_no_scale =
@@ -6697,7 +6435,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(13, 13),
- false,
true);
parent->AddChild(child);
@@ -6803,7 +6540,6 @@ TEST_F(LayerTreeHostCommonTest, ContentsScale) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- false,
true);
scoped_refptr<ContentLayer> child_scale =
@@ -6814,7 +6550,6 @@ TEST_F(LayerTreeHostCommonTest, ContentsScale) {
gfx::PointF(),
gfx::PointF(2.f, 2.f),
gfx::Size(10, 10),
- false,
true);
scoped_refptr<ContentLayer> child_empty =
@@ -6825,7 +6560,6 @@ TEST_F(LayerTreeHostCommonTest, ContentsScale) {
gfx::PointF(),
gfx::PointF(2.f, 2.f),
gfx::Size(),
- false,
true);
scoped_refptr<NoScaleContentLayer> child_no_scale =
@@ -6836,7 +6570,6 @@ TEST_F(LayerTreeHostCommonTest, ContentsScale) {
gfx::PointF(),
gfx::PointF(12.f, 12.f),
gfx::Size(10, 10),
- false,
true);
root->AddChild(parent);
@@ -6991,7 +6724,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- false,
true);
scoped_refptr<ContentLayer> child_scale =
@@ -7002,7 +6734,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(2.f, 2.f),
gfx::Size(10, 10),
- false,
true);
scoped_refptr<ContentLayer> child_empty =
@@ -7013,7 +6744,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(2.f, 2.f),
gfx::Size(),
- false,
true);
scoped_refptr<NoScaleContentLayer> child_no_scale =
@@ -7024,7 +6754,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(12.f, 12.f),
gfx::Size(10, 10),
- false,
true);
root->AddChild(parent);
@@ -7099,7 +6828,6 @@ TEST_F(LayerTreeHostCommonTest, SmallContentsScale) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- false,
true);
scoped_refptr<ContentLayer> child_scale =
@@ -7110,7 +6838,6 @@ TEST_F(LayerTreeHostCommonTest, SmallContentsScale) {
gfx::PointF(),
gfx::PointF(2.f, 2.f),
gfx::Size(10, 10),
- false,
true);
root->AddChild(parent);
@@ -7190,7 +6917,6 @@ TEST_F(LayerTreeHostCommonTest, ContentsScaleForSurfaces) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- false,
true);
scoped_refptr<ContentLayer> surface_scale =
@@ -7201,7 +6927,6 @@ TEST_F(LayerTreeHostCommonTest, ContentsScaleForSurfaces) {
gfx::PointF(),
gfx::PointF(2.f, 2.f),
gfx::Size(10, 10),
- false,
true);
scoped_refptr<ContentLayer> surface_scale_child_scale =
@@ -7212,7 +6937,6 @@ TEST_F(LayerTreeHostCommonTest, ContentsScaleForSurfaces) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- false,
true);
scoped_refptr<NoScaleContentLayer> surface_scale_child_no_scale =
@@ -7223,7 +6947,6 @@ TEST_F(LayerTreeHostCommonTest, ContentsScaleForSurfaces) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- false,
true);
scoped_refptr<NoScaleContentLayer> surface_no_scale =
@@ -7234,7 +6957,6 @@ TEST_F(LayerTreeHostCommonTest, ContentsScaleForSurfaces) {
gfx::PointF(),
gfx::PointF(12.f, 12.f),
gfx::Size(10, 10),
- false,
true);
scoped_refptr<ContentLayer> surface_no_scale_child_scale =
@@ -7245,7 +6967,6 @@ TEST_F(LayerTreeHostCommonTest, ContentsScaleForSurfaces) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- false,
true);
scoped_refptr<NoScaleContentLayer> surface_no_scale_child_no_scale =
@@ -7256,7 +6977,6 @@ TEST_F(LayerTreeHostCommonTest, ContentsScaleForSurfaces) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- false,
true);
root->AddChild(parent);
@@ -7398,7 +7118,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- false,
true);
scoped_refptr<ContentLayer> surface_scale =
@@ -7409,7 +7128,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(2.f, 2.f),
gfx::Size(10, 10),
- false,
true);
scoped_refptr<ContentLayer> surface_scale_child_scale =
@@ -7420,7 +7138,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- false,
true);
scoped_refptr<NoScaleContentLayer> surface_scale_child_no_scale =
@@ -7431,7 +7148,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- false,
true);
scoped_refptr<NoScaleContentLayer> surface_no_scale =
@@ -7442,7 +7158,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(12.f, 12.f),
gfx::Size(10, 10),
- false,
true);
scoped_refptr<ContentLayer> surface_no_scale_child_scale =
@@ -7453,7 +7168,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- false,
true);
scoped_refptr<NoScaleContentLayer> surface_no_scale_child_no_scale =
@@ -7464,7 +7178,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- false,
true);
root->AddChild(parent);
@@ -7607,7 +7320,6 @@ TEST_F(LayerTreeHostCommonTest, ContentsScaleForAnimatingLayer) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- false,
true);
scoped_refptr<ContentLayer> child_scale =
@@ -7618,7 +7330,6 @@ TEST_F(LayerTreeHostCommonTest, ContentsScaleForAnimatingLayer) {
gfx::PointF(),
gfx::PointF(2.f, 2.f),
gfx::Size(10, 10),
- false,
true);
root->AddChild(parent);
@@ -7674,7 +7385,6 @@ TEST_F(LayerTreeHostCommonTest, RenderSurfaceTransformsInHighDPI) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(30, 30),
- false,
true);
scoped_refptr<ContentLayer> child = CreateDrawableContentLayer(&delegate);
@@ -7684,7 +7394,6 @@ TEST_F(LayerTreeHostCommonTest, RenderSurfaceTransformsInHighDPI) {
gfx::PointF(),
gfx::PointF(2.f, 2.f),
gfx::Size(10, 10),
- false,
true);
gfx::Transform replica_transform;
@@ -7696,7 +7405,6 @@ TEST_F(LayerTreeHostCommonTest, RenderSurfaceTransformsInHighDPI) {
gfx::PointF(),
gfx::PointF(2.f, 2.f),
gfx::Size(10, 10),
- false,
true);
// This layer should end up in the same surface as child, with the same draw
@@ -7709,7 +7417,6 @@ TEST_F(LayerTreeHostCommonTest, RenderSurfaceTransformsInHighDPI) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- false,
true);
parent->AddChild(child);
@@ -7813,7 +7520,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(33, 31),
- false,
true);
scoped_refptr<ContentLayer> child = CreateDrawableContentLayer(&delegate);
@@ -7823,7 +7529,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(13, 11),
- false,
true);
gfx::Transform replica_transform;
@@ -7835,7 +7540,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(13, 11),
- false,
true);
// This layer should end up in the same surface as child, with the same draw
@@ -7848,7 +7552,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(13, 11),
- false,
true);
parent->AddChild(child);
@@ -7954,7 +7657,6 @@ TEST_F(LayerTreeHostCommonTest, TransparentChildRenderSurfaceCreation) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
identity_matrix,
@@ -7962,7 +7664,6 @@ TEST_F(LayerTreeHostCommonTest, TransparentChildRenderSurfaceCreation) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(grand_child.get(),
identity_matrix,
@@ -7970,7 +7671,6 @@ TEST_F(LayerTreeHostCommonTest, TransparentChildRenderSurfaceCreation) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
root->AddChild(child);
@@ -7998,7 +7698,6 @@ TEST_F(LayerTreeHostCommonTest, OpacityAnimatingOnPendingTree) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(100, 100),
- true,
false);
root->SetDrawsContent(true);
@@ -8009,7 +7708,6 @@ TEST_F(LayerTreeHostCommonTest, OpacityAnimatingOnPendingTree) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
child->SetDrawsContent(true);
child->SetOpacity(0.0f);
@@ -8053,7 +7751,6 @@ class LCDTextTest
gfx::PointF(),
gfx::PointF(),
gfx::Size(1, 1),
- true,
false);
SetLayerPropertiesForTesting(child_.get(),
identity_matrix,
@@ -8061,7 +7758,6 @@ class LCDTextTest
gfx::PointF(),
gfx::PointF(),
gfx::Size(1, 1),
- true,
false);
SetLayerPropertiesForTesting(grand_child_.get(),
identity_matrix,
@@ -8069,7 +7765,6 @@ class LCDTextTest
gfx::PointF(),
gfx::PointF(),
gfx::Size(1, 1),
- true,
false);
child_->SetForceRenderSurface(std::tr1::get<1>(GetParam()));
@@ -8202,7 +7897,6 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_SingleLayer) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
root->SetIsDrawable(true);
@@ -8213,7 +7907,6 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_SingleLayer) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(40, 40),
- true,
false);
child->SetIsDrawable(true);
@@ -8224,7 +7917,6 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_SingleLayer) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(30, 30),
- true,
false);
grand_child->SetIsDrawable(true);
grand_child->SetHideLayerAndSubtree(true);
@@ -8262,7 +7954,6 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_SingleLayerImpl) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
root->SetDrawsContent(true);
@@ -8273,7 +7964,6 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_SingleLayerImpl) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(40, 40),
- true,
false);
child->SetDrawsContent(true);
@@ -8285,7 +7975,6 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_SingleLayerImpl) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(30, 30),
- true,
false);
grand_child->SetDrawsContent(true);
grand_child->SetHideLayerAndSubtree(true);
@@ -8320,7 +8009,6 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_TwoLayers) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
root->SetIsDrawable(true);
@@ -8331,7 +8019,6 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_TwoLayers) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(40, 40),
- true,
false);
child->SetIsDrawable(true);
child->SetHideLayerAndSubtree(true);
@@ -8343,7 +8030,6 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_TwoLayers) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(30, 30),
- true,
false);
grand_child->SetIsDrawable(true);
@@ -8379,7 +8065,6 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_TwoLayersImpl) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
root->SetDrawsContent(true);
@@ -8390,7 +8075,6 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_TwoLayersImpl) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(40, 40),
- true,
false);
child->SetDrawsContent(true);
child->SetHideLayerAndSubtree(true);
@@ -8403,7 +8087,6 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_TwoLayersImpl) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(30, 30),
- true,
false);
grand_child->SetDrawsContent(true);
@@ -8438,7 +8121,6 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHiddenWithCopyRequest) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
root->SetIsDrawable(true);
@@ -8449,7 +8131,6 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHiddenWithCopyRequest) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(40, 40),
- true,
false);
copy_grand_parent->SetIsDrawable(true);
@@ -8460,7 +8141,6 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHiddenWithCopyRequest) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(30, 30),
- true,
false);
copy_parent->SetIsDrawable(true);
copy_parent->SetForceRenderSurface(true);
@@ -8472,7 +8152,6 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHiddenWithCopyRequest) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(20, 20),
- true,
false);
copy_layer->SetIsDrawable(true);
@@ -8483,7 +8162,6 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHiddenWithCopyRequest) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(20, 20),
- true,
false);
copy_child->SetIsDrawable(true);
@@ -8494,7 +8172,6 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHiddenWithCopyRequest) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(40, 40),
- true,
false);
copy_grand_parent_sibling_before->SetIsDrawable(true);
@@ -8505,7 +8182,6 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHiddenWithCopyRequest) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(40, 40),
- true,
false);
copy_grand_parent_sibling_after->SetIsDrawable(true);
@@ -8591,7 +8267,6 @@ TEST_F(LayerTreeHostCommonTest, ClippedOutCopyRequest) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
root->SetIsDrawable(true);
@@ -8602,7 +8277,6 @@ TEST_F(LayerTreeHostCommonTest, ClippedOutCopyRequest) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(),
- true,
false);
copy_parent->SetIsDrawable(true);
copy_parent->SetMasksToBounds(true);
@@ -8614,7 +8288,6 @@ TEST_F(LayerTreeHostCommonTest, ClippedOutCopyRequest) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(30, 30),
- true,
false);
copy_layer->SetIsDrawable(true);
@@ -8625,7 +8298,6 @@ TEST_F(LayerTreeHostCommonTest, ClippedOutCopyRequest) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(20, 20),
- true,
false);
copy_child->SetIsDrawable(true);
@@ -8669,7 +8341,6 @@ TEST_F(LayerTreeHostCommonTest, VisibleContentRectInsideSurface) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
root->SetIsDrawable(true);
@@ -8681,7 +8352,6 @@ TEST_F(LayerTreeHostCommonTest, VisibleContentRectInsideSurface) {
gfx::PointF(),
gfx::PointF(-10, -20),
gfx::Size(),
- true,
false);
surface->SetForceRenderSurface(true);
@@ -8692,7 +8362,6 @@ TEST_F(LayerTreeHostCommonTest, VisibleContentRectInsideSurface) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
surface_child->SetIsDrawable(true);
@@ -8756,7 +8425,6 @@ TEST_F(LayerTreeHostCommonTest, TransformedClipParent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(render_surface.get(),
identity_transform,
@@ -8764,7 +8432,6 @@ TEST_F(LayerTreeHostCommonTest, TransformedClipParent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(clip_parent.get(),
scale_transform,
@@ -8772,7 +8439,6 @@ TEST_F(LayerTreeHostCommonTest, TransformedClipParent) {
gfx::PointF(),
gfx::PointF(1.f, 1.f),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(intervening.get(),
identity_transform,
@@ -8780,7 +8446,6 @@ TEST_F(LayerTreeHostCommonTest, TransformedClipParent) {
gfx::PointF(),
gfx::PointF(1.f, 1.f),
gfx::Size(5, 5),
- true,
false);
SetLayerPropertiesForTesting(clip_child.get(),
identity_transform,
@@ -8788,7 +8453,6 @@ TEST_F(LayerTreeHostCommonTest, TransformedClipParent) {
gfx::PointF(),
gfx::PointF(1.f, 1.f),
gfx::Size(10, 10),
- true,
false);
scoped_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create();
@@ -8865,7 +8529,6 @@ TEST_F(LayerTreeHostCommonTest, ClipParentWithInterveningRenderSurface) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(clip_parent.get(),
translation_transform,
@@ -8873,7 +8536,6 @@ TEST_F(LayerTreeHostCommonTest, ClipParentWithInterveningRenderSurface) {
gfx::PointF(),
gfx::PointF(1.f, 1.f),
gfx::Size(40, 40),
- true,
false);
SetLayerPropertiesForTesting(render_surface1.get(),
identity_transform,
@@ -8881,7 +8543,6 @@ TEST_F(LayerTreeHostCommonTest, ClipParentWithInterveningRenderSurface) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(intervening.get(),
identity_transform,
@@ -8889,7 +8550,6 @@ TEST_F(LayerTreeHostCommonTest, ClipParentWithInterveningRenderSurface) {
gfx::PointF(),
gfx::PointF(1.f, 1.f),
gfx::Size(5, 5),
- true,
false);
SetLayerPropertiesForTesting(render_surface2.get(),
identity_transform,
@@ -8897,7 +8557,6 @@ TEST_F(LayerTreeHostCommonTest, ClipParentWithInterveningRenderSurface) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(clip_child.get(),
identity_transform,
@@ -8905,7 +8564,6 @@ TEST_F(LayerTreeHostCommonTest, ClipParentWithInterveningRenderSurface) {
gfx::PointF(),
gfx::PointF(-10.f, -10.f),
gfx::Size(60, 60),
- true,
false);
scoped_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create();
@@ -9000,7 +8658,6 @@ TEST_F(LayerTreeHostCommonTest, ClipParentScrolledInterveningLayer) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(clip_parent.get(),
translation_transform,
@@ -9008,7 +8665,6 @@ TEST_F(LayerTreeHostCommonTest, ClipParentScrolledInterveningLayer) {
gfx::PointF(),
gfx::PointF(1.f, 1.f),
gfx::Size(40, 40),
- true,
false);
SetLayerPropertiesForTesting(render_surface1.get(),
identity_transform,
@@ -9016,7 +8672,6 @@ TEST_F(LayerTreeHostCommonTest, ClipParentScrolledInterveningLayer) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(intervening.get(),
identity_transform,
@@ -9024,7 +8679,6 @@ TEST_F(LayerTreeHostCommonTest, ClipParentScrolledInterveningLayer) {
gfx::PointF(),
gfx::PointF(1.f, 1.f),
gfx::Size(5, 5),
- true,
false);
SetLayerPropertiesForTesting(render_surface2.get(),
identity_transform,
@@ -9032,7 +8686,6 @@ TEST_F(LayerTreeHostCommonTest, ClipParentScrolledInterveningLayer) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(clip_child.get(),
identity_transform,
@@ -9040,7 +8693,6 @@ TEST_F(LayerTreeHostCommonTest, ClipParentScrolledInterveningLayer) {
gfx::PointF(),
gfx::PointF(-10.f, -10.f),
gfx::Size(60, 60),
- true,
false);
scoped_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create();
@@ -9122,7 +8774,6 @@ TEST_F(LayerTreeHostCommonTest, DescendantsOfClipChildren) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(clip_parent.get(),
identity_transform,
@@ -9130,7 +8781,6 @@ TEST_F(LayerTreeHostCommonTest, DescendantsOfClipChildren) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(40, 40),
- true,
false);
SetLayerPropertiesForTesting(intervening.get(),
identity_transform,
@@ -9138,7 +8788,6 @@ TEST_F(LayerTreeHostCommonTest, DescendantsOfClipChildren) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(5, 5),
- true,
false);
SetLayerPropertiesForTesting(clip_child.get(),
identity_transform,
@@ -9146,7 +8795,6 @@ TEST_F(LayerTreeHostCommonTest, DescendantsOfClipChildren) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(60, 60),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
identity_transform,
@@ -9154,7 +8802,6 @@ TEST_F(LayerTreeHostCommonTest, DescendantsOfClipChildren) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(60, 60),
- true,
false);
scoped_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create();
@@ -9214,7 +8861,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(15, 15),
- true,
false);
SetLayerPropertiesForTesting(clip_parent.get(),
identity_transform,
@@ -9222,7 +8868,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(render_surface1.get(),
identity_transform,
@@ -9230,7 +8875,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(5, 5),
gfx::Size(5, 5),
- true,
false);
SetLayerPropertiesForTesting(render_surface2.get(),
identity_transform,
@@ -9238,7 +8882,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(5, 5),
- true,
false);
SetLayerPropertiesForTesting(clip_child.get(),
identity_transform,
@@ -9246,7 +8889,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(-1, 1),
gfx::Size(10, 10),
- true,
false);
SetLayerPropertiesForTesting(non_clip_child.get(),
identity_transform,
@@ -9254,7 +8896,6 @@ TEST_F(LayerTreeHostCommonTest,
gfx::PointF(),
gfx::PointF(),
gfx::Size(5, 5),
- true,
false);
render_surface1->SetForceRenderSurface(true);
@@ -9319,20 +8960,19 @@ TEST_F(LayerTreeHostCommonTest, CanRenderToSeparateSurface) {
anchor,
position,
bounds,
- true,
false);
root->SetDrawsContent(true);
// This layer structure normally forces render surface due to preserves3d
// behavior.
+ bool preserves3d = true;
SetLayerPropertiesForTesting(child1.get(),
identity_matrix,
identity_matrix,
anchor,
position,
bounds,
- false,
- true);
+ preserves3d);
child1->SetDrawsContent(true);
SetLayerPropertiesForTesting(child2.get(),
identity_matrix,
@@ -9340,7 +8980,6 @@ TEST_F(LayerTreeHostCommonTest, CanRenderToSeparateSurface) {
anchor,
position,
bounds,
- true,
false);
child2->SetDrawsContent(true);
SetLayerPropertiesForTesting(child3.get(),
@@ -9349,13 +8988,9 @@ TEST_F(LayerTreeHostCommonTest, CanRenderToSeparateSurface) {
anchor,
position,
bounds,
- true,
false);
child3->SetDrawsContent(true);
- child2->SetIs3dSorted(true);
- child3->SetIs3dSorted(true);
-
child2->AddChild(child3.Pass());
child1->AddChild(child2.Pass());
root->AddChild(child1.Pass());
@@ -9397,7 +9032,6 @@ TEST_F(LayerTreeHostCommonTest, DoNotIncludeBackfaceInvisibleSurfaces) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(render_surface.get(),
identity_transform,
@@ -9405,7 +9039,6 @@ TEST_F(LayerTreeHostCommonTest, DoNotIncludeBackfaceInvisibleSurfaces) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(30, 30),
- true,
false);
SetLayerPropertiesForTesting(child.get(),
identity_transform,
@@ -9413,11 +9046,9 @@ TEST_F(LayerTreeHostCommonTest, DoNotIncludeBackfaceInvisibleSurfaces) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(20, 20),
- true,
false);
- root->SetShouldFlattenTransform(false);
- root->SetIs3dSorted(true);
+ root->SetPreserves3d(true);
render_surface->SetDoubleSided(false);
render_surface->SetForceRenderSurface(true);
@@ -9482,7 +9113,6 @@ TEST_F(LayerTreeHostCommonTest, ClippedByScrollParent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(scroll_parent_border.get(),
identity_transform,
@@ -9490,7 +9120,6 @@ TEST_F(LayerTreeHostCommonTest, ClippedByScrollParent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(40, 40),
- true,
false);
SetLayerPropertiesForTesting(scroll_parent_clip.get(),
identity_transform,
@@ -9498,7 +9127,6 @@ TEST_F(LayerTreeHostCommonTest, ClippedByScrollParent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(30, 30),
- true,
false);
SetLayerPropertiesForTesting(scroll_parent.get(),
identity_transform,
@@ -9506,7 +9134,6 @@ TEST_F(LayerTreeHostCommonTest, ClippedByScrollParent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(scroll_child.get(),
identity_transform,
@@ -9514,7 +9141,6 @@ TEST_F(LayerTreeHostCommonTest, ClippedByScrollParent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
scoped_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create();
@@ -9564,7 +9190,6 @@ TEST_F(LayerTreeHostCommonTest, ClippedByOutOfOrderScrollParent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(scroll_parent_border.get(),
identity_transform,
@@ -9572,7 +9197,6 @@ TEST_F(LayerTreeHostCommonTest, ClippedByOutOfOrderScrollParent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(40, 40),
- true,
false);
SetLayerPropertiesForTesting(scroll_parent_clip.get(),
identity_transform,
@@ -9580,7 +9204,6 @@ TEST_F(LayerTreeHostCommonTest, ClippedByOutOfOrderScrollParent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(30, 30),
- true,
false);
SetLayerPropertiesForTesting(scroll_parent.get(),
identity_transform,
@@ -9588,7 +9211,6 @@ TEST_F(LayerTreeHostCommonTest, ClippedByOutOfOrderScrollParent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(scroll_child.get(),
identity_transform,
@@ -9596,7 +9218,6 @@ TEST_F(LayerTreeHostCommonTest, ClippedByOutOfOrderScrollParent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
scoped_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create();
@@ -9661,7 +9282,6 @@ TEST_F(LayerTreeHostCommonTest, ClippedByOutOfOrderScrollGrandparent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(scroll_grandparent_border.get(),
identity_transform,
@@ -9669,7 +9289,6 @@ TEST_F(LayerTreeHostCommonTest, ClippedByOutOfOrderScrollGrandparent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(40, 40),
- true,
false);
SetLayerPropertiesForTesting(scroll_grandparent_clip.get(),
identity_transform,
@@ -9677,7 +9296,6 @@ TEST_F(LayerTreeHostCommonTest, ClippedByOutOfOrderScrollGrandparent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(20, 20),
- true,
false);
SetLayerPropertiesForTesting(scroll_grandparent.get(),
identity_transform,
@@ -9685,7 +9303,6 @@ TEST_F(LayerTreeHostCommonTest, ClippedByOutOfOrderScrollGrandparent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(scroll_parent_border.get(),
identity_transform,
@@ -9693,7 +9310,6 @@ TEST_F(LayerTreeHostCommonTest, ClippedByOutOfOrderScrollGrandparent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(40, 40),
- true,
false);
SetLayerPropertiesForTesting(scroll_parent_clip.get(),
identity_transform,
@@ -9701,7 +9317,6 @@ TEST_F(LayerTreeHostCommonTest, ClippedByOutOfOrderScrollGrandparent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(30, 30),
- true,
false);
SetLayerPropertiesForTesting(scroll_parent.get(),
identity_transform,
@@ -9709,7 +9324,6 @@ TEST_F(LayerTreeHostCommonTest, ClippedByOutOfOrderScrollGrandparent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(scroll_child.get(),
identity_transform,
@@ -9717,7 +9331,6 @@ TEST_F(LayerTreeHostCommonTest, ClippedByOutOfOrderScrollGrandparent) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
scoped_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create();
@@ -9804,7 +9417,6 @@ TEST_F(LayerTreeHostCommonTest, OutOfOrderClippingRequiresRSLLSorting) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(scroll_grandparent_border.get(),
identity_transform,
@@ -9812,7 +9424,6 @@ TEST_F(LayerTreeHostCommonTest, OutOfOrderClippingRequiresRSLLSorting) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(40, 40),
- true,
false);
SetLayerPropertiesForTesting(scroll_grandparent_clip.get(),
identity_transform,
@@ -9820,7 +9431,6 @@ TEST_F(LayerTreeHostCommonTest, OutOfOrderClippingRequiresRSLLSorting) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(20, 20),
- true,
false);
SetLayerPropertiesForTesting(scroll_grandparent.get(),
identity_transform,
@@ -9828,7 +9438,6 @@ TEST_F(LayerTreeHostCommonTest, OutOfOrderClippingRequiresRSLLSorting) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(render_surface1.get(),
identity_transform,
@@ -9836,7 +9445,6 @@ TEST_F(LayerTreeHostCommonTest, OutOfOrderClippingRequiresRSLLSorting) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(scroll_parent_border.get(),
identity_transform,
@@ -9844,7 +9452,6 @@ TEST_F(LayerTreeHostCommonTest, OutOfOrderClippingRequiresRSLLSorting) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(40, 40),
- true,
false);
SetLayerPropertiesForTesting(scroll_parent_clip.get(),
identity_transform,
@@ -9852,7 +9459,6 @@ TEST_F(LayerTreeHostCommonTest, OutOfOrderClippingRequiresRSLLSorting) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(30, 30),
- true,
false);
SetLayerPropertiesForTesting(scroll_parent.get(),
identity_transform,
@@ -9860,7 +9466,6 @@ TEST_F(LayerTreeHostCommonTest, OutOfOrderClippingRequiresRSLLSorting) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(render_surface2.get(),
identity_transform,
@@ -9868,7 +9473,6 @@ TEST_F(LayerTreeHostCommonTest, OutOfOrderClippingRequiresRSLLSorting) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(scroll_child.get(),
identity_transform,
@@ -9876,7 +9480,6 @@ TEST_F(LayerTreeHostCommonTest, OutOfOrderClippingRequiresRSLLSorting) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
scoped_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create();
@@ -9963,7 +9566,6 @@ TEST_F(LayerTreeHostCommonTest, DoNotClobberSorting) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(scroll_parent_border.get(),
identity_transform,
@@ -9971,7 +9573,6 @@ TEST_F(LayerTreeHostCommonTest, DoNotClobberSorting) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(40, 40),
- true,
false);
SetLayerPropertiesForTesting(scroll_parent_clip.get(),
identity_transform,
@@ -9979,7 +9580,6 @@ TEST_F(LayerTreeHostCommonTest, DoNotClobberSorting) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(30, 30),
- true,
false);
SetLayerPropertiesForTesting(scroll_parent.get(),
identity_transform,
@@ -9987,7 +9587,6 @@ TEST_F(LayerTreeHostCommonTest, DoNotClobberSorting) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(scroll_child.get(),
identity_transform,
@@ -9995,7 +9594,6 @@ TEST_F(LayerTreeHostCommonTest, DoNotClobberSorting) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(top_content.get(),
top_transform,
@@ -10003,19 +9601,16 @@ TEST_F(LayerTreeHostCommonTest, DoNotClobberSorting) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- false,
- true);
+ false);
SetLayerPropertiesForTesting(bottom_content.get(),
bottom_transform,
bottom_transform,
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- false,
- true);
+ false);
- scroll_child->SetShouldFlattenTransform(false);
- scroll_child->SetIs3dSorted(true);
+ scroll_child->SetPreserves3d(true);
scroll_child->AddChild(top_content.Pass());
scroll_child->AddChild(bottom_content.Pass());
@@ -10087,7 +9682,6 @@ TEST_F(LayerTreeHostCommonTest, ScrollCompensationWithRounding) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
SetLayerPropertiesForTesting(container.get(),
container_transform,
@@ -10095,7 +9689,6 @@ TEST_F(LayerTreeHostCommonTest, ScrollCompensationWithRounding) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(40, 40),
- true,
false);
SetLayerPropertiesForTesting(scroller.get(),
identity_transform,
@@ -10103,7 +9696,6 @@ TEST_F(LayerTreeHostCommonTest, ScrollCompensationWithRounding) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(30, 30),
- true,
false);
SetLayerPropertiesForTesting(fixed.get(),
identity_transform,
@@ -10111,7 +9703,6 @@ TEST_F(LayerTreeHostCommonTest, ScrollCompensationWithRounding) {
gfx::PointF(),
gfx::PointF(),
gfx::Size(50, 50),
- true,
false);
scroller->AddChild(fixed.Pass());
generated by cgit v1.1 at 2025-03-30 15:53:53 +0000