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 f2cfe6df89089e1d84dbdbbf892b2d9b84fbdd2d..9d286509d09069b89211e1c130bfdda8b75f3160 100644 |
--- a/content/renderer/gpu/render_widget_compositor.cc |
+++ b/content/renderer/gpu/render_widget_compositor.cc |
@@ -59,6 +59,7 @@ |
#include "third_party/WebKit/public/web/WebRuntimeFeatures.h" |
#include "third_party/WebKit/public/web/WebSelection.h" |
#include "ui/gl/gl_switches.h" |
+#include "ui/native_theme/material_design_constants.h" |
#include "ui/native_theme/native_theme_switches.h" |
#if defined(OS_ANDROID) |
@@ -420,14 +421,20 @@ cc::LayerTreeSettings RenderWidgetCompositor::GenerateLayerTreeSettings( |
#if !defined(OS_MACOSX) |
if (ui::IsOverlayScrollbarEnabled()) { |
settings.scrollbar_animator = cc::LayerTreeSettings::THINNING; |
- settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128); |
+ settings.scrollbar_fade_delay_ms = ui::kMDScrollbarFadeOutDelayMs; |
+ settings.scrollbar_fade_resize_delay_ms = ui::kMDScrollbarFadeOutDelayMs; |
+ settings.scrollbar_fade_duration_ms = ui::kMDScrollbarFadeOutDurationMs; |
+ settings.scrollbar_thinning_duration_ms = |
+ ui::kMDScrollbarThinningDurationMs; |
} else { |
+ // TODO(bokan): This section is probably unneeded? We don't use scrollbar |
+ // animations for non overlay scrollbars. |
settings.scrollbar_animator = cc::LayerTreeSettings::LINEAR_FADE; |
settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128); |
+ settings.scrollbar_fade_delay_ms = 500; |
+ settings.scrollbar_fade_resize_delay_ms = 500; |
+ settings.scrollbar_fade_duration_ms = 300; |
} |
- settings.scrollbar_fade_delay_ms = 500; |
- settings.scrollbar_fade_resize_delay_ms = 500; |
- settings.scrollbar_fade_duration_ms = 300; |
#endif // !defined(OS_MACOSX) |
// On desktop, if there's over 4GB of memory on the machine, increase the |