| Index: cc/test/layer_tree_host_common_test.cc
|
| diff --git a/cc/test/layer_tree_host_common_test.cc b/cc/test/layer_tree_host_common_test.cc
|
| index 33e0cafc47c1f06520c1cc28e6268d59811dd610..844165720f6fdb7433a8ef0a28604e77a53996a5 100644
|
| --- a/cc/test/layer_tree_host_common_test.cc
|
| +++ b/cc/test/layer_tree_host_common_test.cc
|
| @@ -59,7 +59,8 @@ void LayerTreeHostCommonTestBase::ExecuteCalculateDrawProperties(
|
| 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) {
|
| EXPECT_TRUE(page_scale_application_layer || (page_scale_factor == 1.f));
|
| gfx::Transform identity_matrix;
|
| gfx::Size device_viewport_size =
|
| @@ -77,6 +78,7 @@ void LayerTreeHostCommonTestBase::ExecuteCalculateDrawProperties(
|
| inputs.page_scale_factor = page_scale_factor;
|
| inputs.page_scale_application_layer = page_scale_application_layer;
|
| inputs.can_use_lcd_text = can_use_lcd_text;
|
| + inputs.layers_always_allowed_lcd_text = layers_always_allowed_lcd_text;
|
| inputs.can_adjust_raster_scales = true;
|
| LayerTreeHostCommon::CalculateDrawProperties(&inputs);
|
| }
|
| @@ -86,7 +88,8 @@ void LayerTreeHostCommonTestBase::ExecuteCalculateDrawProperties(
|
| 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) {
|
| gfx::Transform identity_matrix;
|
| gfx::Size device_viewport_size =
|
| gfx::Size(root_layer->bounds().width() * device_scale_factor,
|
| @@ -103,6 +106,7 @@ void LayerTreeHostCommonTestBase::ExecuteCalculateDrawProperties(
|
| inputs.page_scale_factor = page_scale_factor;
|
| inputs.page_scale_application_layer = page_scale_application_layer;
|
| inputs.can_use_lcd_text = can_use_lcd_text;
|
| + inputs.layers_always_allowed_lcd_text = layers_always_allowed_lcd_text;
|
| inputs.can_adjust_raster_scales = true;
|
|
|
| ++render_surface_layer_list_count_;
|
|
|