Merge 175917

content/public/common/content_switches.cc

Index: content/public/common/content_switches.cc
===================================================================
--- content/public/common/content_switches.cc	(revision 176705)
+++ content/public/common/content_switches.cc	(working copy)
@@ -588,10 +588,15 @@
     "enable-accelerated-overflow-scroll";
 
 // Enables accelerated compositing for scrollable frames for accelerated
-// scrolling for them.
+// scrolling for them. Requires kForceCompositingMode.
 const char kEnableAcceleratedScrollableFrames[] =
      "enable-accelerated-scrollable-frames";
 
+// Enables accelerated scrolling by the compositor for frames. Requires
+// kForceCompositingMode and kEnableAcceleratedScrollableFrames.
+const char kEnableCompositedScrollingForFrames[] =
+     "enable-composited-scrolling-for-frames";
+
 // Visibly render a border around paint rects in the web page to help debug
 // and study painting behavior.
 const char kShowPaintRects[]                = "show-paint-rects";