| Index: cc/trees/layer_tree_impl.cc
|
| diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
|
| index 4082462d433f8bfd15512e23cc7f74f6e8e12e59..c922be03744ac3da0af88ef83a19f70ceaeed3be 100644
|
| --- a/cc/trees/layer_tree_impl.cc
|
| +++ b/cc/trees/layer_tree_impl.cc
|
| @@ -1410,15 +1410,13 @@ LayerTreeImpl::CreateScrollbarAnimationController(ElementId scroll_element_id) {
|
| DCHECK(!settings().scrollbar_fade_delay.is_zero());
|
| DCHECK(!settings().scrollbar_fade_duration.is_zero());
|
| base::TimeDelta fade_delay = settings().scrollbar_fade_delay;
|
| - base::TimeDelta fade_out_resize_delay =
|
| - settings().scrollbar_fade_out_resize_delay;
|
| base::TimeDelta fade_duration = settings().scrollbar_fade_duration;
|
| switch (settings().scrollbar_animator) {
|
| case LayerTreeSettings::ANDROID_OVERLAY: {
|
| return ScrollbarAnimationController::
|
| - CreateScrollbarAnimationControllerAndroid(
|
| - scroll_element_id, layer_tree_host_impl_, fade_delay,
|
| - fade_out_resize_delay, fade_duration);
|
| + CreateScrollbarAnimationControllerAndroid(scroll_element_id,
|
| + layer_tree_host_impl_,
|
| + fade_delay, fade_duration);
|
| }
|
| case LayerTreeSettings::AURA_OVERLAY: {
|
| base::TimeDelta thinning_duration =
|
| @@ -1426,7 +1424,7 @@ LayerTreeImpl::CreateScrollbarAnimationController(ElementId scroll_element_id) {
|
| return ScrollbarAnimationController::
|
| CreateScrollbarAnimationControllerAuraOverlay(
|
| scroll_element_id, layer_tree_host_impl_, fade_delay,
|
| - fade_out_resize_delay, fade_duration, thinning_duration);
|
| + fade_duration, thinning_duration);
|
| }
|
| case LayerTreeSettings::NO_ANIMATOR:
|
| NOTREACHED();
|
|
|