Linux/CrOS smooth scrolling support - behind a flag.

webkit/glue/webpreferences.cc

Index: webkit/glue/webpreferences.cc
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index 79ca2fa5ddd20bce683322303dbf9f2f5cc09116..ac4e843e794489669b22e05ff8e1249f6ffc9850 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -80,7 +80,8 @@ WebPreferences::WebPreferences()
       interactive_form_validation_enabled(true),
       fullscreen_enabled(false),
       allow_displaying_insecure_content(true),
-      allow_running_insecure_content(false) {
+      allow_running_insecure_content(false),
+      enable_scroll_animator(false) {
 }
 
 WebPreferences::~WebPreferences() {
@@ -229,4 +230,7 @@ void WebPreferences::Apply(WebView* web_view) const {
   settings->setFullScreenEnabled(fullscreen_enabled);
   settings->setAllowDisplayOfInsecureContent(allow_displaying_insecure_content);
   settings->setAllowRunningOfInsecureContent(allow_running_insecure_content);
+#if defined(ENABLE_SMOOTH_SCROLLING)

[darin (slow to review), 2011/05/31 20:40:24]

we normally do not use WebKit ENABLE_ macros in chromium code.  I think you can
just leave this code without the #if check.

[Scott Byer, 2011/05/31 21:02:45]

If I leave it unprotected, the compile breaks until the WebKit change is in. I
could put a TODO in to remove the check once the WebKit change has cycled
through.

+  settings->setEnableScrollAnimator(enable_scroll_animator);
+#endif
 }