Index: cc/trees/layer_tree_impl.cc |
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc |
index 6e44bfc80355276bcc249f751725ed695b6fbf89..3f5557a814c8cdc35403f9ae5e5fc9796f0be933 100644 |
--- a/cc/trees/layer_tree_impl.cc |
+++ b/cc/trees/layer_tree_impl.cc |
@@ -778,17 +778,25 @@ LayerTreeImpl::CreateScrollbarAnimationController(LayerImpl* scrolling_layer) { |
DCHECK(settings().scrollbar_fade_duration_ms); |
base::TimeDelta delay = |
base::TimeDelta::FromMilliseconds(settings().scrollbar_fade_delay_ms); |
+ base::TimeDelta resize_delay = base::TimeDelta::FromMilliseconds( |
+ settings().scrollbar_fade_resize_delay_ms); |
base::TimeDelta duration = |
base::TimeDelta::FromMilliseconds(settings().scrollbar_fade_duration_ms); |
switch (settings().scrollbar_animator) { |
case LayerTreeSettings::LinearFade: { |
return ScrollbarAnimationControllerLinearFade::Create( |
- scrolling_layer, layer_tree_host_impl_, delay, duration) |
- .PassAs<ScrollbarAnimationController>(); |
+ scrolling_layer, |
+ layer_tree_host_impl_, |
+ delay, |
+ resize_delay, |
+ duration).PassAs<ScrollbarAnimationController>(); |
} |
case LayerTreeSettings::Thinning: { |
- return ScrollbarAnimationControllerThinning::Create( |
- scrolling_layer, layer_tree_host_impl_, delay, duration) |
+ return ScrollbarAnimationControllerThinning::Create(scrolling_layer, |
+ layer_tree_host_impl_, |
+ delay, |
+ resize_delay, |
+ duration) |
.PassAs<ScrollbarAnimationController>(); |
} |
case LayerTreeSettings::NoAnimator: |