| Index: cc/test/layer_tree_host_common_test.h
|
| diff --git a/cc/test/layer_tree_host_common_test.h b/cc/test/layer_tree_host_common_test.h
|
| index 45a42b86c453785094df208dde6bb298b21b3ec2..e4f16d3987eb0b61e96ed8fba54cf20691058ac7 100644
|
| --- a/cc/test/layer_tree_host_common_test.h
|
| +++ b/cc/test/layer_tree_host_common_test.h
|
| @@ -76,22 +76,18 @@ class LayerTreeHostCommonTestBase : public LayerTestCommon::LayerImplTest {
|
| void ExecuteCalculateDrawProperties(Layer* root_layer,
|
| float device_scale_factor,
|
| float page_scale_factor,
|
| - Layer* page_scale_application_layer,
|
| - bool can_use_lcd_text,
|
| - bool layers_always_allowed_lcd_text);
|
| + Layer* page_scale_application_layer);
|
|
|
| void ExecuteCalculateDrawProperties(LayerImpl* root_layer,
|
| float device_scale_factor,
|
| float page_scale_factor,
|
| - LayerImpl* page_scale_application_layer,
|
| - bool can_use_lcd_text,
|
| - bool layers_always_allowed_lcd_text);
|
| + LayerImpl* page_scale_application_layer);
|
|
|
| template <class LayerType>
|
| void ExecuteCalculateDrawProperties(LayerType* root_layer) {
|
| LayerType* page_scale_application_layer = NULL;
|
| ExecuteCalculateDrawProperties(root_layer, 1.f, 1.f,
|
| - page_scale_application_layer, false, false);
|
| + page_scale_application_layer);
|
| }
|
|
|
| template <class LayerType>
|
| @@ -99,17 +95,7 @@ class LayerTreeHostCommonTestBase : public LayerTestCommon::LayerImplTest {
|
| float device_scale_factor) {
|
| LayerType* page_scale_application_layer = NULL;
|
| ExecuteCalculateDrawProperties(root_layer, device_scale_factor, 1.f,
|
| - page_scale_application_layer, false, false);
|
| - }
|
| -
|
| - template <class LayerType>
|
| - void ExecuteCalculateDrawProperties(LayerType* root_layer,
|
| - float device_scale_factor,
|
| - float page_scale_factor,
|
| - LayerType* page_scale_application_layer) {
|
| - ExecuteCalculateDrawProperties(root_layer, device_scale_factor,
|
| - page_scale_factor,
|
| - page_scale_application_layer, false, false);
|
| + page_scale_application_layer);
|
| }
|
|
|
| void ExecuteCalculateDrawPropertiesWithPropertyTrees(Layer* layer);
|
|
|