summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/renderer_host/render_process_host_impl.cc2
-rw-r--r--content/browser/web_contents/web_contents_impl.cc8
2 files changed, 10 insertions, 0 deletions
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 5336df8..814ab9e 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -907,6 +907,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
switches::kDisableTouchAdjustment,
switches::kDisableTouchDragDrop,
switches::kDisableTouchEditing,
+ switches::kDisableUniversalAcceleratedOverflowScroll,
switches::kDisableVp8AlphaPlayback,
switches::kDisableWebAudio,
switches::kDisableWebKitMediaSource,
@@ -956,6 +957,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
switches::kEnableStatsTable,
switches::kEnableStrictSiteIsolation,
switches::kEnableThreadedCompositing,
+ switches::kEnableUniversalAcceleratedOverflowScroll,
switches::kEnableTouchDragDrop,
switches::kEnableTouchEditing,
switches::kEnableViewport,
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 60a8bb2..a590c2e 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -533,6 +533,14 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
if (command_line.HasSwitch(switches::kDisableCompositedScrollingForFrames))
prefs.composited_scrolling_for_frames_enabled = false;
+ prefs.universal_accelerated_compositing_for_overflow_scroll_enabled = false;
+ if (command_line.HasSwitch(
+ switches::kEnableUniversalAcceleratedOverflowScroll))
+ prefs.universal_accelerated_compositing_for_overflow_scroll_enabled = true;
+ if (command_line.HasSwitch(
+ switches::kDisableUniversalAcceleratedOverflowScroll))
+ prefs.universal_accelerated_compositing_for_overflow_scroll_enabled = false;
+
prefs.show_paint_rects =
command_line.HasSwitch(switches::kShowPaintRects);
prefs.accelerated_compositing_enabled =