| Index: cc/trees/layer_tree_settings.cc
|
| diff --git a/cc/trees/layer_tree_settings.cc b/cc/trees/layer_tree_settings.cc
|
| index 7a2d0a93f38ba1f49c9038ac031713032d5acfad..232a52274468b5cb8541953ee2cc866cd38cfb9b 100644
|
| --- a/cc/trees/layer_tree_settings.cc
|
| +++ b/cc/trees/layer_tree_settings.cc
|
| @@ -40,10 +40,9 @@ bool LayerTreeSettings::operator==(const LayerTreeSettings& other) const {
|
| other.gpu_rasterization_msaa_sample_count &&
|
| create_low_res_tiling == other.create_low_res_tiling &&
|
| scrollbar_animator == other.scrollbar_animator &&
|
| - scrollbar_fade_delay_ms == other.scrollbar_fade_delay_ms &&
|
| - scrollbar_fade_resize_delay_ms ==
|
| - other.scrollbar_fade_resize_delay_ms &&
|
| - scrollbar_fade_duration_ms == other.scrollbar_fade_duration_ms &&
|
| + scrollbar_fade_delay == other.scrollbar_fade_delay &&
|
| + scrollbar_fade_resize_delay == other.scrollbar_fade_resize_delay &&
|
| + scrollbar_fade_duration == other.scrollbar_fade_duration &&
|
| solid_color_scrollbar_color == other.solid_color_scrollbar_color &&
|
| timeout_and_draw_when_animation_checkerboards ==
|
| other.timeout_and_draw_when_animation_checkerboards &&
|
|
|