Add a flag for enabling/disabling the new accelerated scrolling path

content/public/common/content_switches.cc

Index: content/public/common/content_switches.cc
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index 158c4f9bec596cc4cf4db60f10196f01210eacc8..c0454b4d27a44938b7e8378a1626ad309a21e9a8 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -289,6 +289,11 @@ const char kDisableThreadedCompositing[]     = "disable-threaded-compositing";
 // Disables the threaded HTML parser in Blink
 const char kDisableThreadedHTMLParser[]     = "disable-threaded-html-parser";
 
+// Disable accelerated overflow scrolling in corner cases (that would not be
+// handled by enable-accelerated-overflow-scroll).
+const char kDisableUniversalAcceleratedOverflowScroll[] =
+    "disable-universal-accelerated-overflow-scroll";
+
 // Disable web audio API.
 const char kDisableWebAudio[]               = "disable-webaudio";
 
@@ -538,6 +543,10 @@ const char kEnableTextServicesFramework[]   = "enable-text-services-framework";
 // Enable multithreaded GPU compositing of web content.
 const char kEnableThreadedCompositing[]     = "enable-threaded-compositing";
 
+// Enable accelerated overflow scrolling in all cases.
+const char kEnableUniversalAcceleratedOverflowScroll[] =
+    "enable-universal-accelerated-overflow-scroll";
+
 // Enable screen capturing support for MediaStream API.
 const char kEnableUserMediaScreenCapturing[] =
     "enable-usermedia-screen-capturing";