| Index: cc/trees/layer_tree_host_common_perftest.cc
|
| diff --git a/cc/trees/layer_tree_host_common_perftest.cc b/cc/trees/layer_tree_host_common_perftest.cc
|
| index 12e7a5e2f9d5ebfa431b858dc31c7f99cc319bdf..39bcbe628cc60cf9e21c03d2c9aecde88e6926e3 100644
|
| --- a/cc/trees/layer_tree_host_common_perftest.cc
|
| +++ b/cc/trees/layer_tree_host_common_perftest.cc
|
| @@ -93,19 +93,17 @@ class CalcDrawPropsMainTest : public LayerTreeHostCommonPerfTest {
|
| RenderSurfaceLayerList update_list;
|
| LayerTreeHostCommon::CalcDrawPropsMainInputs inputs(
|
| layer_tree_host()->root_layer(),
|
| - layer_tree_host()->device_viewport_size(),
|
| - gfx::Transform(),
|
| + layer_tree_host()->device_viewport_size(), gfx::Transform(),
|
| layer_tree_host()->device_scale_factor(),
|
| layer_tree_host()->page_scale_factor(),
|
| - layer_tree_host()->page_scale_layer(),
|
| - max_texture_size,
|
| + layer_tree_host()->page_scale_layer(), max_texture_size,
|
| layer_tree_host()->settings().can_use_lcd_text,
|
| + layer_tree_host()->settings().layers_always_allowed_lcd_text,
|
| can_render_to_separate_surface,
|
| layer_tree_host()
|
| ->settings()
|
| .layer_transforms_should_scale_layer_contents,
|
| - &update_list,
|
| - 0);
|
| + &update_list, 0);
|
| LayerTreeHostCommon::CalculateDrawProperties(&inputs);
|
|
|
| timer_.NextLap();
|
| @@ -147,18 +145,15 @@ class CalcDrawPropsImplTest : public LayerTreeHostCommonPerfTest {
|
| LayerTreeHostImpl* host_impl) {
|
| LayerImplList update_list;
|
| LayerTreeHostCommon::CalcDrawPropsImplInputs inputs(
|
| - active_tree->root_layer(),
|
| - active_tree->DrawViewportSize(),
|
| - host_impl->DrawTransform(),
|
| - active_tree->device_scale_factor(),
|
| + active_tree->root_layer(), active_tree->DrawViewportSize(),
|
| + host_impl->DrawTransform(), active_tree->device_scale_factor(),
|
| active_tree->total_page_scale_factor(),
|
| - active_tree->InnerViewportContainerLayer(),
|
| - max_texture_size,
|
| + active_tree->InnerViewportContainerLayer(), max_texture_size,
|
| host_impl->settings().can_use_lcd_text,
|
| + host_impl->settings().layers_always_allowed_lcd_text,
|
| can_render_to_separate_surface,
|
| host_impl->settings().layer_transforms_should_scale_layer_contents,
|
| - &update_list,
|
| - 0);
|
| + &update_list, 0);
|
| LayerTreeHostCommon::CalculateDrawProperties(&inputs);
|
| }
|
| };
|
|
|