Update from https://crrev.com/304715

cc/trees/layer_tree_host_common.h

Index: cc/trees/layer_tree_host_common.h
diff --git a/cc/trees/layer_tree_host_common.h b/cc/trees/layer_tree_host_common.h
index 089fe2933f274eda73a0242571902f7c71d252c7..349b341f6ba9783da9465a26f1af8f70c8af4fb4 100644
--- a/cc/trees/layer_tree_host_common.h
+++ b/cc/trees/layer_tree_host_common.h
@@ -40,6 +40,7 @@ class CC_EXPORT LayerTreeHostCommon {
                         const LayerType* page_scale_application_layer,
                         int max_texture_size,
                         bool can_use_lcd_text,
+                        bool layers_always_allowed_lcd_text,
                         bool can_render_to_separate_surface,
                         bool can_adjust_raster_scales,
                         RenderSurfaceLayerListType* render_surface_layer_list,
@@ -52,6 +53,7 @@ class CC_EXPORT LayerTreeHostCommon {
           page_scale_application_layer(page_scale_application_layer),
           max_texture_size(max_texture_size),
           can_use_lcd_text(can_use_lcd_text),
+          layers_always_allowed_lcd_text(layers_always_allowed_lcd_text),
           can_render_to_separate_surface(can_render_to_separate_surface),
           can_adjust_raster_scales(can_adjust_raster_scales),
           render_surface_layer_list(render_surface_layer_list),
@@ -66,6 +68,7 @@ class CC_EXPORT LayerTreeHostCommon {
     const LayerType* page_scale_application_layer;
     int max_texture_size;
     bool can_use_lcd_text;
+    bool layers_always_allowed_lcd_text;
     bool can_render_to_separate_surface;
     bool can_adjust_raster_scales;
     RenderSurfaceLayerListType* render_surface_layer_list;
@@ -222,6 +225,7 @@ LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType,
           NULL,
           std::numeric_limits<int>::max() / 2,
           false,
+          false,
           true,
           false,
           render_surface_layer_list,
@@ -246,6 +250,7 @@ LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType,
           NULL,
           std::numeric_limits<int>::max() / 2,
           false,
+          false,
           true,
           false,
           render_surface_layer_list,