| Index: content/renderer/gpu/render_widget_compositor.cc
|
| diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
|
| index 3d535c5afcbdfab438c0c03d3ac2f09c8f4a4497..fc5a1303cc0245cb6991268c9f8f3a189ad739fd 100644
|
| --- a/content/renderer/gpu/render_widget_compositor.cc
|
| +++ b/content/renderer/gpu/render_widget_compositor.cc
|
| @@ -443,10 +443,11 @@ cc::LayerTreeSettings RenderWidgetCompositor::GenerateLayerTreeSettings(
|
| #if !defined(OS_MACOSX)
|
| if (ui::IsOverlayScrollbarEnabled()) {
|
| settings.scrollbar_animator = cc::LayerTreeSettings::AURA_OVERLAY;
|
| - settings.scrollbar_show_delay = ui::kOverlayScrollbarShowDelay;
|
| + settings.scrollbar_fade_in_delay = ui::kOverlayScrollbarFadeInDelay;
|
| settings.scrollbar_fade_out_delay = ui::kOverlayScrollbarFadeOutDelay;
|
| settings.scrollbar_fade_out_resize_delay =
|
| ui::kOverlayScrollbarFadeOutDelay;
|
| + settings.scrollbar_fade_in_duration = ui::kOverlayScrollbarFadeInDuration;
|
| settings.scrollbar_fade_out_duration = ui::kOverlayScrollbarFadeOutDuration;
|
| settings.scrollbar_thinning_duration =
|
| ui::kOverlayScrollbarThinningDuration;
|
|
|