Add an --enable-accelerated-2d-canvas flag to test_shell. This will use the in-process Mesa (software) backend, so it should be usable today on the layout test builders.

BUG=none
TEST=none yet

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

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

5 files changed, 15 insertions, 1 deletions

diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 53e3071..2b932bf 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -444,6 +444,12 @@ void TestShell::SetAllowScriptsToCloseWindows() {
 }
 
 // static
+void TestShell::SetAccelerated2dCanvasEnabled(bool enabled) {
+  if (web_prefs_)
+    web_prefs_->accelerated_2d_canvas_enabled = enabled;
+}
+
+// static
 void TestShell::ResetWebPreferences() {
     DCHECK(web_prefs_);
 
diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h
index 737bd72..268846f 100644
--- a/webkit/tools/test_shell/test_shell.h
+++ b/webkit/tools/test_shell/test_shell.h
@@ -278,6 +278,8 @@ public:
 
     static void SetAllowScriptsToCloseWindows();
 
+    static void SetAccelerated2dCanvasEnabled(bool enabled);
+
     WebPreferences* GetWebPreferences() { return web_prefs_; }
 
     // Some layout tests hardcode a file:///tmp/LayoutTests URL.  We get around
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index c36490d..0162db5 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -215,6 +215,9 @@ int main(int argc, char* argv[]) {
   if (!parsed_command_line.HasSwitch(switches::kUseGL))
     gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL);
 
+  if (parsed_command_line.HasSwitch(test_shell::kEnableAccel2DCanvas))
+    TestShell::SetAccelerated2dCanvasEnabled(true);
+
   // Treat the first argument as the initial URL to open.
   GURL starting_url;
 
diff --git a/webkit/tools/test_shell/test_shell_switches.cc b/webkit/tools/test_shell/test_shell_switches.cc
index 9cd8312..7cc94aa 100644
--- a/webkit/tools/test_shell/test_shell_switches.cc
+++ b/webkit/tools/test_shell/test_shell_switches.cc
@@ -84,6 +84,8 @@ const char kProfiler[] = "profiler";
 // Make functions of the HeapProfiler class available in javascript
 const char kHeapProfiler[] = "heap-profiler";
 
-const char kAllowExternalPages[] = "allow-external-pages";    
+const char kAllowExternalPages[] = "allow-external-pages";
+
+const char kEnableAccel2DCanvas[] = "enable-accelerated-2d-canvas";
 
 }  // namespace test_shell
diff --git a/webkit/tools/test_shell/test_shell_switches.h b/webkit/tools/test_shell/test_shell_switches.h
index 46ec7b2..f92e6a0 100644
--- a/webkit/tools/test_shell/test_shell_switches.h
+++ b/webkit/tools/test_shell/test_shell_switches.h
@@ -35,6 +35,7 @@ extern const char kGDB[];
 extern const char kProfiler[];
 extern const char kHeapProfiler[];
 extern const char kAllowExternalPages[];
+extern const char kEnableAccel2DCanvas[];
 
 }  // namespace test_shell