Update from https://crrev.com/304715

cc/trees/layer_tree_host_common.h

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_TREES_LAYER_TREE_HOST_COMMON_H_
 #define CC_TREES_LAYER_TREE_HOST_COMMON_H_
 
 #include <limits>
 #include <vector>
 
@@ skipping 22 matching lines @@
   struct CalcDrawPropsInputs {
    public:
     CalcDrawPropsInputs(LayerType* root_layer,
                         const gfx::Size& device_viewport_size,
                         const gfx::Transform& device_transform,
                         float device_scale_factor,
                         float page_scale_factor,
                         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,
                         int current_render_surface_layer_list_id)
         : root_layer(root_layer),
           device_viewport_size(device_viewport_size),
           device_transform(device_transform),
           device_scale_factor(device_scale_factor),
           page_scale_factor(page_scale_factor),
           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),
           current_render_surface_layer_list_id(
               current_render_surface_layer_list_id) {}
 
     LayerType* root_layer;
     gfx::Size device_viewport_size;
     const gfx::Transform& device_transform;
     float device_scale_factor;
     float page_scale_factor;
     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;
     int current_render_surface_layer_list_id;
   };
 
   template <typename LayerType, typename RenderSurfaceLayerListType>
   struct CalcDrawPropsInputsForTesting
       : public CalcDrawPropsInputs<LayerType, RenderSurfaceLayerListType> {
     CalcDrawPropsInputsForTesting(
@@ skipping 136 matching lines @@
         RenderSurfaceLayerListType* render_surface_layer_list)
     : CalcDrawPropsInputs<LayerType, RenderSurfaceLayerListType>(
           root_layer,
           device_viewport_size,
           device_transform,
           1.f,
           1.f,
           NULL,
           std::numeric_limits<int>::max() / 2,
           false,
+          false,
           true,
           false,
           render_surface_layer_list,
           0) {
   DCHECK(root_layer);
   DCHECK(render_surface_layer_list);
 }
 
 template <typename LayerType, typename RenderSurfaceLayerListType>
 LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType,
                                                    RenderSurfaceLayerListType>::
     CalcDrawPropsInputsForTesting(
         LayerType* root_layer,
         const gfx::Size& device_viewport_size,
         RenderSurfaceLayerListType* render_surface_layer_list)
     : CalcDrawPropsInputs<LayerType, RenderSurfaceLayerListType>(
           root_layer,
           device_viewport_size,
           identity_transform_,
           1.f,
           1.f,
           NULL,
           std::numeric_limits<int>::max() / 2,
           false,
+          false,
           true,
           false,
           render_surface_layer_list,
           0) {
   DCHECK(root_layer);
   DCHECK(render_surface_layer_list);
 }
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_HOST_COMMON_H_