| 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 b86073e9658973411d7ce536625fbd5cdf55c630..b6c7631c744cd0d7965191fd7105db39b4a6fbda 100644
|
| --- a/content/renderer/gpu/render_widget_compositor.cc
|
| +++ b/content/renderer/gpu/render_widget_compositor.cc
|
| @@ -398,8 +398,6 @@ cc::LayerTreeSettings RenderWidgetCompositor::GenerateLayerTreeSettings(
|
| } else {
|
| settings.scrollbar_animator = cc::LayerTreeSettings::ANDROID_OVERLAY;
|
| settings.scrollbar_fade_delay = base::TimeDelta::FromMilliseconds(300);
|
| - settings.scrollbar_fade_out_resize_delay =
|
| - base::TimeDelta::FromMilliseconds(2000);
|
| settings.scrollbar_fade_duration = base::TimeDelta::FromMilliseconds(300);
|
| settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128);
|
| }
|
| @@ -445,7 +443,6 @@ cc::LayerTreeSettings RenderWidgetCompositor::GenerateLayerTreeSettings(
|
| if (ui::IsOverlayScrollbarEnabled()) {
|
| settings.scrollbar_animator = cc::LayerTreeSettings::AURA_OVERLAY;
|
| settings.scrollbar_fade_delay = ui::kOverlayScrollbarFadeDelay;
|
| - settings.scrollbar_fade_out_resize_delay = ui::kOverlayScrollbarFadeDelay;
|
| settings.scrollbar_fade_duration = ui::kOverlayScrollbarFadeDuration;
|
| settings.scrollbar_thinning_duration =
|
| ui::kOverlayScrollbarThinningDuration;
|
| @@ -455,8 +452,6 @@ cc::LayerTreeSettings RenderWidgetCompositor::GenerateLayerTreeSettings(
|
| settings.scrollbar_animator = cc::LayerTreeSettings::ANDROID_OVERLAY;
|
| settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128);
|
| settings.scrollbar_fade_delay = base::TimeDelta::FromMilliseconds(500);
|
| - settings.scrollbar_fade_out_resize_delay =
|
| - base::TimeDelta::FromMilliseconds(500);
|
| settings.scrollbar_fade_duration = base::TimeDelta::FromMilliseconds(300);
|
| }
|
| #endif // !defined(OS_MACOSX)
|
|
|