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

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

Issue 1136843009: cc: Remove unused use_pinch_zoom_scrollbars flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « cc/trees/layer_tree_settings.cc ('k') | no next file » | 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 df8674a24e1730b1cb2f621e17988549de0b1767..bb300271fd732cc816e111ff87077ba2802f186b 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -433,10 +433,7 @@ void RenderWidgetCompositor::Initialize() {
if (ui::IsOverlayScrollbarEnabled()) {
settings.scrollbar_animator = cc::LayerTreeSettings::THINNING;
settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128);
- } else if (cmd->HasSwitch(cc::switches::kEnablePinchVirtualViewport)) {
- // use_pinch_zoom_scrollbars is only true on desktop when non-overlay
- // scrollbars are in use.
- settings.use_pinch_zoom_scrollbars = true;
+ } else if (settings.use_pinch_virtual_viewport) {
settings.scrollbar_animator = cc::LayerTreeSettings::LINEAR_FADE;
settings.solid_color_scrollbar_color = SkColorSetARGB(128, 128, 128, 128);
}
« no previous file with comments | « cc/trees/layer_tree_settings.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698