| Index: cc/trees/layer_tree_impl.cc
|
| diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
|
| index f7f0304ee5f74064c75be4de70aa691da4cd3487..e70d095cfde6d97355e328b01bcd5e0ccb994efc 100644
|
| --- a/cc/trees/layer_tree_impl.cc
|
| +++ b/cc/trees/layer_tree_impl.cc
|
| @@ -1484,15 +1484,17 @@ LayerTreeImpl::CreateScrollbarAnimationController(int scroll_layer_id) {
|
| fade_out_resize_delay, fade_out_duration);
|
| }
|
| case LayerTreeSettings::AURA_OVERLAY: {
|
| - DCHECK(!settings().scrollbar_show_delay.is_zero());
|
| - base::TimeDelta show_delay = settings().scrollbar_show_delay;
|
| + DCHECK(!settings().scrollbar_fade_in_delay.is_zero());
|
| + DCHECK(!settings().scrollbar_fade_in_duration.is_zero());
|
| + base::TimeDelta fade_in_delay = settings().scrollbar_fade_in_delay;
|
| + base::TimeDelta fade_in_duration = settings().scrollbar_fade_in_duration;
|
| base::TimeDelta thinning_duration =
|
| settings().scrollbar_thinning_duration;
|
| return ScrollbarAnimationController::
|
| CreateScrollbarAnimationControllerAuraOverlay(
|
| - scroll_layer_id, layer_tree_host_impl_, show_delay,
|
| - fade_out_delay, fade_out_resize_delay, fade_out_duration,
|
| - thinning_duration);
|
| + scroll_layer_id, layer_tree_host_impl_, fade_in_delay,
|
| + fade_out_delay, fade_out_resize_delay, fade_in_duration,
|
| + fade_out_duration, thinning_duration);
|
| }
|
| case LayerTreeSettings::NO_ANIMATOR:
|
| NOTREACHED();
|
|
|