| 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 b6fad3a8f3adbc677f4c4f290cbb79710bd59857..940a58881f4547d377da6ee828923ec19ddff68d 100644
|
| --- a/cc/trees/layer_tree_host_common_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_common_unittest.cc
|
| @@ -119,14 +119,14 @@ void ExecuteCalculateDrawProperties(LayerImpl* root_layer,
|
| // We are probably not testing what is intended if the root_layer bounds are
|
| // empty.
|
| DCHECK(!root_layer->bounds().IsEmpty());
|
| - LayerTreeHostCommon::CalculateDrawProperties(root_layer,
|
| - device_viewport_size,
|
| - device_scale_factor,
|
| - page_scale_factor,
|
| - dummy_max_texture_size,
|
| - can_use_lcd_text,
|
| - &dummy_render_surface_layer_list,
|
| - false);
|
| + LayerTreeHostCommon::CalculateDrawProperties(
|
| + root_layer,
|
| + device_viewport_size,
|
| + device_scale_factor,
|
| + page_scale_factor,
|
| + dummy_max_texture_size,
|
| + can_use_lcd_text,
|
| + &dummy_render_surface_layer_list);
|
| }
|
|
|
| template <class LayerType>
|
| @@ -4093,8 +4093,7 @@ TEST(LayerTreeHostCommonTest, HitTestingForSingleLayer) {
|
| 1.f,
|
| dummy_max_texture_size,
|
| false,
|
| - &render_surface_layer_list,
|
| - false);
|
| + &render_surface_layer_list);
|
|
|
| // Sanity check the scenario we just created.
|
| ASSERT_EQ(1u, render_surface_layer_list.size());
|
| @@ -4168,8 +4167,7 @@ TEST(LayerTreeHostCommonTest, HitTestingForSingleLayerAndHud) {
|
| 1.f,
|
| dummy_max_texture_size,
|
| false,
|
| - &render_surface_layer_list,
|
| - false);
|
| + &render_surface_layer_list);
|
|
|
| // Sanity check the scenario we just created.
|
| ASSERT_EQ(1u, render_surface_layer_list.size());
|
| @@ -4235,8 +4233,7 @@ TEST(LayerTreeHostCommonTest, HitTestingForUninvertibleTransform) {
|
| 1.f,
|
| dummy_max_texture_size,
|
| false,
|
| - &render_surface_layer_list,
|
| - false);
|
| + &render_surface_layer_list);
|
|
|
| // Sanity check the scenario we just created.
|
| ASSERT_EQ(1u, render_surface_layer_list.size());
|
| @@ -4311,8 +4308,7 @@ TEST(LayerTreeHostCommonTest, HitTestingForSinglePositionedLayer) {
|
| 1.f,
|
| dummy_max_texture_size,
|
| false,
|
| - &render_surface_layer_list,
|
| - false);
|
| + &render_surface_layer_list);
|
|
|
| // Sanity check the scenario we just created.
|
| ASSERT_EQ(1u, render_surface_layer_list.size());
|
| @@ -4376,8 +4372,7 @@ TEST(LayerTreeHostCommonTest, HitTestingForSingleRotatedLayer) {
|
| 1.f,
|
| dummy_max_texture_size,
|
| false,
|
| - &render_surface_layer_list,
|
| - false);
|
| + &render_surface_layer_list);
|
|
|
| // Sanity check the scenario we just created.
|
| ASSERT_EQ(1u, render_surface_layer_list.size());
|
| @@ -4454,8 +4449,7 @@ TEST(LayerTreeHostCommonTest, HitTestingForSinglePerspectiveLayer) {
|
| 1.f,
|
| dummy_max_texture_size,
|
| false,
|
| - &render_surface_layer_list,
|
| - false);
|
| + &render_surface_layer_list);
|
|
|
| // Sanity check the scenario we just created.
|
| ASSERT_EQ(1u, render_surface_layer_list.size());
|
| @@ -4543,8 +4537,7 @@ TEST(LayerTreeHostCommonTest, HitTestingForSingleLayerWithScaledContents) {
|
| 1.f,
|
| dummy_max_texture_size,
|
| false,
|
| - &render_surface_layer_list,
|
| - false);
|
| + &render_surface_layer_list);
|
|
|
| // Sanity check the scenario we just created.
|
| // The visible content rect for test_layer is actually 100x100, even though
|
| @@ -4643,8 +4636,7 @@ TEST(LayerTreeHostCommonTest, HitTestingForSimpleClippedLayer) {
|
| 1.f,
|
| dummy_max_texture_size,
|
| false,
|
| - &render_surface_layer_list,
|
| - false);
|
| + &render_surface_layer_list);
|
|
|
| // Sanity check the scenario we just created.
|
| ASSERT_EQ(1u, render_surface_layer_list.size());
|
| @@ -4776,8 +4768,7 @@ TEST(LayerTreeHostCommonTest, HitTestingForMultiClippedRotatedLayer) {
|
| 1.f,
|
| dummy_max_texture_size,
|
| false,
|
| - &render_surface_layer_list,
|
| - false);
|
| + &render_surface_layer_list);
|
|
|
| // Sanity check the scenario we just created.
|
| // The grand_child is expected to create a render surface because it
|
| @@ -4902,8 +4893,7 @@ TEST(LayerTreeHostCommonTest, HitTestingForNonClippingIntermediateLayer) {
|
| 1.f,
|
| dummy_max_texture_size,
|
| false,
|
| - &render_surface_layer_list,
|
| - false);
|
| + &render_surface_layer_list);
|
|
|
| // Sanity check the scenario we just created.
|
| ASSERT_EQ(1u, render_surface_layer_list.size());
|
| @@ -5019,8 +5009,7 @@ TEST(LayerTreeHostCommonTest, HitTestingForMultipleLayers) {
|
| 1.f,
|
| dummy_max_texture_size,
|
| false,
|
| - &render_surface_layer_list,
|
| - false);
|
| + &render_surface_layer_list);
|
|
|
| // Sanity check the scenario we just created.
|
| ASSERT_TRUE(child1);
|
| @@ -5172,8 +5161,7 @@ TEST(LayerTreeHostCommonTest, HitTestingForMultipleLayerLists) {
|
| 1.f,
|
| dummy_max_texture_size,
|
| false,
|
| - &render_surface_layer_list,
|
| - false);
|
| + &render_surface_layer_list);
|
|
|
| // Sanity check the scenario we just created.
|
| ASSERT_TRUE(child1);
|
| @@ -5289,8 +5277,7 @@ TEST(LayerTreeHostCommonTest, HitCheckingTouchHandlerRegionsForSingleLayer) {
|
| 1.f,
|
| dummy_max_texture_size,
|
| false,
|
| - &render_surface_layer_list,
|
| - false);
|
| + &render_surface_layer_list);
|
|
|
| // Sanity check the scenario we just created.
|
| ASSERT_EQ(1u, render_surface_layer_list.size());
|
| @@ -5386,8 +5373,7 @@ TEST(LayerTreeHostCommonTest,
|
| 1.f,
|
| dummy_max_texture_size,
|
| false,
|
| - &render_surface_layer_list,
|
| - false);
|
| + &render_surface_layer_list);
|
|
|
| // Sanity check the scenario we just created.
|
| ASSERT_EQ(1u, render_surface_layer_list.size());
|
| @@ -5473,8 +5459,7 @@ TEST(LayerTreeHostCommonTest,
|
| 1.f,
|
| dummy_max_texture_size,
|
| false,
|
| - &render_surface_layer_list,
|
| - false);
|
| + &render_surface_layer_list);
|
|
|
| // Sanity check the scenario we just created.
|
| ASSERT_EQ(1u, render_surface_layer_list.size());
|
| @@ -5578,8 +5563,7 @@ TEST(LayerTreeHostCommonTest,
|
| 1.f,
|
| dummy_max_texture_size,
|
| false,
|
| - &render_surface_layer_list,
|
| - false);
|
| + &render_surface_layer_list);
|
|
|
| // Sanity check the scenario we just created.
|
| // The visible content rect for test_layer is actually 100x100, even though
|
| @@ -5694,8 +5678,7 @@ TEST(LayerTreeHostCommonTest,
|
| 1,
|
| dummy_max_texture_size,
|
| false,
|
| - &render_surface_layer_list,
|
| - false);
|
| + &render_surface_layer_list);
|
|
|
| // Sanity check the scenario we just created.
|
| // The visible content rect for test_layer is actually 100x100, even though
|
| @@ -5833,8 +5816,7 @@ TEST(LayerTreeHostCommonTest,
|
| 1.f,
|
| dummy_max_texture_size,
|
| false,
|
| - &render_surface_layer_list,
|
| - false);
|
| + &render_surface_layer_list);
|
|
|
| // Sanity check the scenario we just created.
|
| ASSERT_EQ(1u, render_surface_layer_list.size());
|
| @@ -7294,8 +7276,7 @@ TEST(LayerTreeHostCommonTest, OpacityAnimatingOnPendingTree) {
|
| 1.f,
|
| dummy_max_texture_size,
|
| false,
|
| - &render_surface_layer_list,
|
| - false);
|
| + &render_surface_layer_list);
|
|
|
| // We should have one render surface and two layers. The child
|
| // layer should be included even though it is transparent.
|
|
|