Add smooth scrolling command line switch for test_shell.

This makes it easier to debug layout test cases involving scroll animation.

BUG=118507
TEST=Bring up test shell with --enable-smooth-scrolling switch and scroll around, should be animated.

Review URL: https://chromiumcodereview.appspot.com/9829003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128235 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 15 insertions, 2 deletions

diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 0a79030..e277fcb 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -365,6 +365,12 @@ void TestShell::ResetWebPreferences() {
 }
 
 // static
+WebPreferences* TestShell::GetWebPreferences() {
+  DCHECK(web_prefs_);
+  return web_prefs_;
+}
+
+// static
 bool TestShell::RemoveWindowFromList(gfx::NativeWindow window) {
   WindowList::iterator entry =
       std::find(TestShell::windowList()->begin(),
diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h
index fbe5541..f00d38a 100644
--- a/webkit/tools/test_shell/test_shell.h
+++ b/webkit/tools/test_shell/test_shell.h
@@ -234,7 +234,7 @@ public:
     static void SetAccelerated2dCanvasEnabled(bool enabled);
     static void SetAcceleratedCompositingEnabled(bool enabled);
 
-    WebPreferences* GetWebPreferences() { return web_prefs_; }
+    static WebPreferences* GetWebPreferences();
 
     // Some layout tests hardcode a file:///tmp/LayoutTests URL.  We get around
     // this by substituting "tmp" with the path to the LayoutTests parent dir.
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index d6aba54..8ae0714 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -35,6 +35,7 @@
 #include "webkit/extensions/v8/playback_extension.h"
 #include "webkit/extensions/v8/profiler_extension.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/glue/webpreferences.h"
 #include "webkit/glue/window_open_disposition.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/tools/test_shell/test_shell.h"
@@ -201,6 +202,9 @@ int main(int argc, char* argv[]) {
   if (parsed_command_line.HasSwitch(test_shell::kAllowScriptsToCloseWindows))
     TestShell::SetAllowScriptsToCloseWindows();
 
+  if (parsed_command_line.HasSwitch(test_shell::kEnableSmoothScrolling))
+    TestShell::GetWebPreferences()->enable_scroll_animator = true;
+
   // Disable user themes for layout tests so pixel tests are consistent.
 #if defined(OS_WIN)
   TestShellWebTheme::Engine engine;
diff --git a/webkit/tools/test_shell/test_shell_switches.cc b/webkit/tools/test_shell/test_shell_switches.cc
index 867f831..ab5941f 100644
--- a/webkit/tools/test_shell/test_shell_switches.cc
+++ b/webkit/tools/test_shell/test_shell_switches.cc
@@ -85,4 +85,6 @@ const char kEnableAccel2DCanvas[] = "enable-accelerated-2d-canvas";
 
 const char kEnableAccelCompositing[] = "enable-accelerated-compositing";
 
+const char kEnableSmoothScrolling[] = "enable-smooth-scrolling";
+
 }  // namespace test_shell
diff --git a/webkit/tools/test_shell/test_shell_switches.h b/webkit/tools/test_shell/test_shell_switches.h
index e2cc6d1..a7255f1 100644
--- a/webkit/tools/test_shell/test_shell_switches.h
+++ b/webkit/tools/test_shell/test_shell_switches.h
@@ -34,6 +34,7 @@ extern const char kHeapProfiler[];
 extern const char kAllowExternalPages[];
 extern const char kEnableAccel2DCanvas[];
 extern const char kEnableAccelCompositing[];
+extern const char kEnableSmoothScrolling[];
 
 }  // namespace test_shell