Linux/CrOS smooth scrolling support - behind a flag.

webkit/glue/webpreferences.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/webpreferences.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
@@ skipping 62 matching lines @@
       composite_to_texture_enabled(false),
       accelerated_layers_enabled(false),
       accelerated_video_enabled(false),
       accelerated_2d_canvas_enabled(false),
       accelerated_drawing_enabled(false),
       accelerated_plugins_enabled(false),
       memory_info_enabled(false),
       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() {
 }
 
 void WebPreferences::Apply(WebView* web_view) const {
   WebSettings* settings = web_view->settings();
   settings->setStandardFontFamily(standard_font_family);
   settings->setFixedFontFamily(fixed_font_family);
   settings->setSerifFontFamily(serif_font_family);
@@ skipping 128 matching lines @@
   // Tabs to link is not part of the settings. WebCore calls
   // ChromeClient::tabsToLinks which is part of the glue code.
   web_view->setTabsToLinks(tabs_to_links);
 
   settings->setInteractiveFormValidationEnabled(
       interactive_form_validation_enabled);
 
   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
 }