Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(452)

Unified Diff: content/renderer/gpu/render_widget_compositor.cc

Issue 2339873002: Replace hide-scrollbars flag with a web setting. (Closed)
Patch Set: check for presence of settings using DCHECK + sync. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/common/web_preferences.cc ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c377422df09bc1fb21aaf8e192674c5931fa241d..3ce066b54ee122feac4f0b88e72b3acc555c35be 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -384,8 +384,8 @@ cc::LayerTreeSettings RenderWidgetCompositor::GenerateLayerTreeSettings(
if (base::SysInfo::IsLowEndDevice())
settings.gpu_rasterization_enabled = false;
settings.using_synchronous_renderer_compositor = using_synchronous_compositor;
- // Also hide scrollbars for Android WebView, since it uses system scrollbars.
- if (ui::ShouldHideScrollbars() || using_synchronous_compositor) {
+ if (using_synchronous_compositor) {
+ // Android WebView uses system scrollbars, so make ours invisible.
settings.scrollbar_animator = cc::LayerTreeSettings::NO_ANIMATOR;
settings.solid_color_scrollbar_color = SK_ColorTRANSPARENT;
} else {
@@ -426,10 +426,7 @@ cc::LayerTreeSettings RenderWidgetCompositor::GenerateLayerTreeSettings(
settings.create_low_res_tiling = true;
#else // defined(OS_ANDROID)
#if !defined(OS_MACOSX)
- if (ui::ShouldHideScrollbars()) {
- settings.scrollbar_animator = cc::LayerTreeSettings::NO_ANIMATOR;
- settings.solid_color_scrollbar_color = SK_ColorTRANSPARENT;
- } else if (ui::IsOverlayScrollbarEnabled()) {
+ if (ui::IsOverlayScrollbarEnabled()) {
settings.scrollbar_animator = cc::LayerTreeSettings::THINNING;
settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128);
} else {
« no previous file with comments | « content/public/common/web_preferences.cc ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698