| Index: cc/trees/layer_tree_impl.cc
|
| diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
|
| index 3195352d69619817d6b48a6baff8557482758184..180458ee1c7e3949ed8351deddf4c84db590b453 100644
|
| --- a/cc/trees/layer_tree_impl.cc
|
| +++ b/cc/trees/layer_tree_impl.cc
|
| @@ -296,7 +296,7 @@ void ForceScrollbarParameterUpdateAfterScaleChange(LayerImpl* current_layer) {
|
| return;
|
|
|
| while (current_layer) {
|
| - current_layer->ScrollbarParametersDidChange();
|
| + current_layer->ScrollbarParametersDidChange(false);
|
| current_layer = current_layer->parent();
|
| }
|
| }
|
| @@ -792,16 +792,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);
|
| + scrolling_layer,
|
| + layer_tree_host_impl_,
|
| + delay,
|
| + resize_delay,
|
| + duration);
|
| }
|
| 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);
|
| }
|
| case LayerTreeSettings::NoAnimator:
|
| NOTREACHED();
|
|
|