| 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 38b57d496d7f580ca0f6cf1989390c6619d8ee32..456183f5c349295489e99ee800c2390152927abe 100644
|
| --- a/cc/test/layer_tree_host_common_test.h
|
| +++ b/cc/test/layer_tree_host_common_test.h
|
| @@ -68,30 +68,29 @@ class LayerTreeHostCommonTestBase {
|
| float device_scale_factor,
|
| float page_scale_factor,
|
| Layer* page_scale_application_layer,
|
| - bool can_use_lcd_text);
|
| + bool can_use_lcd_text,
|
| + bool layers_always_allowed_lcd_text);
|
|
|
| void ExecuteCalculateDrawProperties(LayerImpl* root_layer,
|
| float device_scale_factor,
|
| float page_scale_factor,
|
| LayerImpl* page_scale_application_layer,
|
| - bool can_use_lcd_text);
|
| + bool can_use_lcd_text,
|
| + bool layers_always_allowed_lcd_text);
|
|
|
| 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);
|
| + ExecuteCalculateDrawProperties(root_layer, 1.f, 1.f,
|
| + page_scale_application_layer, false, false);
|
| }
|
|
|
| template <class LayerType>
|
| void ExecuteCalculateDrawProperties(LayerType* root_layer,
|
| float device_scale_factor) {
|
| LayerType* page_scale_application_layer = NULL;
|
| - ExecuteCalculateDrawProperties(root_layer,
|
| - device_scale_factor,
|
| - 1.f,
|
| - page_scale_application_layer,
|
| - false);
|
| + ExecuteCalculateDrawProperties(root_layer, device_scale_factor, 1.f,
|
| + page_scale_application_layer, false, false);
|
| }
|
|
|
| template <class LayerType>
|
| @@ -99,11 +98,9 @@ class LayerTreeHostCommonTestBase {
|
| float device_scale_factor,
|
| float page_scale_factor,
|
| LayerType* page_scale_application_layer) {
|
| - ExecuteCalculateDrawProperties(root_layer,
|
| - device_scale_factor,
|
| + ExecuteCalculateDrawProperties(root_layer, device_scale_factor,
|
| page_scale_factor,
|
| - page_scale_application_layer,
|
| - false);
|
| + page_scale_application_layer, false, false);
|
| }
|
|
|
| RenderSurfaceLayerList* render_surface_layer_list() const {
|
|
|