Update from https://crrev.com/304715

cc/trees/layer_tree_host_common_perftest.cc

 // Copyright 2013 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.
 
 #include "cc/trees/layer_tree_host_common.h"
 
 #include <sstream>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 75 matching lines @@
 
   void BeginTest() override {
     timer_.Reset();
 
     do {
       bool can_render_to_separate_surface = true;
       int max_texture_size = 8096;
       RenderSurfaceLayerList update_list;
       LayerTreeHostCommon::CalcDrawPropsMainInputs inputs(
           layer_tree_host()->root_layer(),
-          layer_tree_host()->device_viewport_size(),
-          gfx::Transform(),
+          layer_tree_host()->device_viewport_size(), gfx::Transform(),
           layer_tree_host()->device_scale_factor(),
           layer_tree_host()->page_scale_factor(),
-          layer_tree_host()->page_scale_layer(),
-          max_texture_size,
+          layer_tree_host()->page_scale_layer(), max_texture_size,
           layer_tree_host()->settings().can_use_lcd_text,
+          layer_tree_host()->settings().layers_always_allowed_lcd_text,
           can_render_to_separate_surface,
           layer_tree_host()
               ->settings()
               .layer_transforms_should_scale_layer_contents,
-          &update_list,
-          0);
+          &update_list, 0);
       LayerTreeHostCommon::CalculateDrawProperties(&inputs);
 
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
 
     EndTest();
   }
 };
 
 class CalcDrawPropsImplTest : public LayerTreeHostCommonPerfTest {
@@ skipping 21 matching lines @@
 
     EndTest();
   }
 
   void DoCalcDrawPropertiesImpl(bool can_render_to_separate_surface,
                                 int max_texture_size,
                                 LayerTreeImpl* active_tree,
                                 LayerTreeHostImpl* host_impl) {
     LayerImplList update_list;
     LayerTreeHostCommon::CalcDrawPropsImplInputs inputs(
-        active_tree->root_layer(),
-        active_tree->DrawViewportSize(),
-        host_impl->DrawTransform(),
-        active_tree->device_scale_factor(),
+        active_tree->root_layer(), active_tree->DrawViewportSize(),
+        host_impl->DrawTransform(), active_tree->device_scale_factor(),
         active_tree->total_page_scale_factor(),
-        active_tree->InnerViewportContainerLayer(),
-        max_texture_size,
+        active_tree->InnerViewportContainerLayer(), max_texture_size,
         host_impl->settings().can_use_lcd_text,
+        host_impl->settings().layers_always_allowed_lcd_text,
         can_render_to_separate_surface,
         host_impl->settings().layer_transforms_should_scale_layer_contents,
-        &update_list,
-        0);
+        &update_list, 0);
     LayerTreeHostCommon::CalculateDrawProperties(&inputs);
   }
 };
 
 class LayerSorterMainTest : public CalcDrawPropsImplTest {
  public:
   void RunSortLayers() { RunTest(false, false, false); }
 
   void BeginTest() override { PostSetNeedsCommitToMainThread(); }
 
@@ skipping 177 matching lines @@
 
 TEST_F(BspTreePerfTest, BspTreeCubes_4) {
   SetTestName("bsp_tree_cubes_4");
   SetNumberOfDuplicates(4);
   ReadTestFile("layer_sort_cubes");
   RunSortLayers();
 }
 
 }  // namespace
 }  // namespace cc