Update from https://crrev.com/314320

cc/trees/layer_tree_settings.cc

 // 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.
 
 #include "cc/trees/layer_tree_settings.h"
 
 #include <GLES2/gl2.h>
 #include <limits>
 
 #include "base/command_line.h"
@@ skipping 11 matching lines @@
       main_frame_before_activation_enabled(false),
       using_synchronous_renderer_compositor(false),
       disable_hi_res_timer_tasks_on_battery(false),
       report_overscroll_only_for_scrollable_axes(false),
       per_tile_painting_enabled(false),
       accelerated_animation_enabled(true),
       can_use_lcd_text(true),
       use_distance_field_text(false),
       gpu_rasterization_enabled(false),
       gpu_rasterization_forced(false),
+      gpu_rasterization_msaa_sample_count(0),
       create_low_res_tiling(false),
       scrollbar_animator(NoAnimator),
       scrollbar_fade_delay_ms(0),
       scrollbar_fade_resize_delay_ms(0),
       scrollbar_fade_duration_ms(0),
+      scrollbar_show_scale_threshold(1.0f),
       solid_color_scrollbar_color(SK_ColorWHITE),
       calculate_top_controls_position(false),
       timeout_and_draw_when_animation_checkerboards(true),
       maximum_number_of_failed_draws_before_draw_is_forced_(3),
       layer_transforms_should_scale_layer_contents(false),
       layers_always_allowed_lcd_text(false),
       minimum_contents_scale(0.0625f),
       low_res_contents_scale_factor(0.25f),
       top_controls_show_threshold(0.5f),
       top_controls_hide_threshold(0.5f),
@@ skipping 20 matching lines @@
       scheduled_raster_task_limit(32),
       use_occlusion_for_tile_prioritization(false),
       record_full_layer(false),
       use_display_lists(false),
       verify_property_trees(false) {
 }
 
 LayerTreeSettings::~LayerTreeSettings() {}
 
 }  // namespace cc