test_shell command line switch enable-accelerated-compositing added

(Resubmission of patch in http://codereview.chromium.org/3492004/show which was incorrectly git cl push-ed)

BUG=none
TEST=none yet - will use layout tests configured to use accelerated implementation.

Review URL: http://codereview.chromium.org/3440029

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

5 files changed, 17 insertions, 1 deletions

diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 06cba17..feb272e 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -115,6 +115,7 @@ int TestShell::file_test_timeout_ms_ = kDefaultFileTestTimeoutMillisecs;
 bool TestShell::test_is_preparing_ = false;
 bool TestShell::test_is_pending_ = false;
 bool TestShell::accelerated_2d_canvas_enabled_ = false;
+bool TestShell::accelerated_compositing_enabled_ = false;
 
 TestShell::TestShell()
     : m_mainWnd(NULL),
@@ -450,6 +451,11 @@ void TestShell::SetAccelerated2dCanvasEnabled(bool enabled) {
 }
 
 // static
+void TestShell::SetAcceleratedCompositingEnabled(bool enabled) {
+  accelerated_compositing_enabled_ = enabled;
+}
+
+// static
 void TestShell::ResetWebPreferences() {
     DCHECK(web_prefs_);
 
@@ -513,7 +519,8 @@ void TestShell::ResetWebPreferences() {
         web_prefs_->tabs_to_links = false;
         web_prefs_->accelerated_2d_canvas_enabled =
             accelerated_2d_canvas_enabled_;
-
+        web_prefs_->accelerated_compositing_enabled =
+            accelerated_compositing_enabled_;
         // Allow those layout tests running as local files, i.e. under
         // LayoutTests/http/tests/local, to access http server.
         if (layout_test_mode_)
diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h
index d40167e..f055e27 100644
--- a/webkit/tools/test_shell/test_shell.h
+++ b/webkit/tools/test_shell/test_shell.h
@@ -279,6 +279,7 @@ public:
     static void SetAllowScriptsToCloseWindows();
 
     static void SetAccelerated2dCanvasEnabled(bool enabled);
+    static void SetAcceleratedCompositingEnabled(bool enabled);
 
     WebPreferences* GetWebPreferences() { return web_prefs_; }
 
@@ -437,6 +438,9 @@ private:
     // True if we're testing the accelerated canvas 2d path.
     static bool accelerated_2d_canvas_enabled_;
 
+    // True if we're testing the accelerated compositing.
+    static bool accelerated_compositing_enabled_;
+
     // True if driven from a nested message loop.
     bool is_modal_;
 
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index 38a04a8..16fb336 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -128,6 +128,8 @@ int main(int argc, char* argv[]) {
 
   if (parsed_command_line.HasSwitch(test_shell::kEnableAccel2DCanvas))
     TestShell::SetAccelerated2dCanvasEnabled(true);
+  if (parsed_command_line.HasSwitch(test_shell::kEnableAccelCompositing))
+    TestShell::SetAcceleratedCompositingEnabled(true);
 
   TestShell::InitLogging(suppress_error_dialogs,
                          layout_test_mode,
diff --git a/webkit/tools/test_shell/test_shell_switches.cc b/webkit/tools/test_shell/test_shell_switches.cc
index 7cc94aa..b66e3a4 100644
--- a/webkit/tools/test_shell/test_shell_switches.cc
+++ b/webkit/tools/test_shell/test_shell_switches.cc
@@ -88,4 +88,6 @@ const char kAllowExternalPages[] = "allow-external-pages";
 
 const char kEnableAccel2DCanvas[] = "enable-accelerated-2d-canvas";
 
+const char kEnableAccelCompositing[] = "enable-accelerated-compositing";
+
 }  // namespace test_shell
diff --git a/webkit/tools/test_shell/test_shell_switches.h b/webkit/tools/test_shell/test_shell_switches.h
index f92e6a0..6f2afc0f 100644
--- a/webkit/tools/test_shell/test_shell_switches.h
+++ b/webkit/tools/test_shell/test_shell_switches.h
@@ -36,6 +36,7 @@ extern const char kProfiler[];
 extern const char kHeapProfiler[];
 extern const char kAllowExternalPages[];
 extern const char kEnableAccel2DCanvas[];
+extern const char kEnableAccelCompositing[];
 
 }  // namespace test_shell