Merge 175917

webkit/glue/webpreferences.cc

Index: webkit/glue/webpreferences.cc
===================================================================
--- webkit/glue/webpreferences.cc	(revision 176705)
+++ webkit/glue/webpreferences.cc	(working copy)
@@ -84,6 +84,7 @@
       show_fps_counter(false),
       accelerated_compositing_for_overflow_scroll_enabled(false),
       accelerated_compositing_for_scrollable_frames_enabled(false),
+      composited_scrolling_for_frames_enabled(false),
       show_paint_rects(false),
       render_vsync_enabled(true),
       asynchronous_spell_checking_enabled(true),
@@ -360,6 +361,10 @@
   settings->setAcceleratedCompositingForScrollableFramesEnabled(
       accelerated_compositing_for_scrollable_frames_enabled);
 
+  // Enables composited scrolling for frames if requested on command line.
+  settings->setCompositedScrollingForFramesEnabled(
+      composited_scrolling_for_frames_enabled);
+
   // Display the current compositor tree as overlay if requested on
   // the command line
   settings->setShowPlatformLayerTree(show_composited_layer_tree);