Add a command line switch to control accelerated 2d canvas

TEST=none
BUG=none

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

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

6 files changed, 13 insertions, 0 deletions

diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
index a99d549..44eb819 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -268,6 +268,8 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
         command_line.HasSwitch(switches::kShowCompositedLayerBorders);
     web_prefs.accelerated_compositing_enabled =
         command_line.HasSwitch(switches::kEnableAcceleratedCompositing);
+    web_prefs.accelerated_2d_canvas_enabled =
+        command_line.HasSwitch(switches::kEnableAccelerated2dCanvas);
     web_prefs.memory_info_enabled =
         command_line.HasSwitch(switches::kEnableMemoryInfo);
     // The user stylesheet watcher may not exist in a testing profile.
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index c29eed1..3aadd0a 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -268,6 +268,9 @@ const char kDumpHistogramsOnExit[]          = "dump-histograms-on-exit";
 // Enable gpu-accelerated compositing.
 const char kEnableAcceleratedCompositing[]  = "enable-accelerated-compositing";
 
+// Enable gpu-accelerated 2d canvas.
+const char kEnableAccelerated2dCanvas[]     = "enable-accelerated-2d-canvas";
+
 // Enables AeroPeek for each tab. (This switch only works on Windows 7).
 const char kEnableAeroPeekTabs[]            = "enable-aero-peek-tabs";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 7695e37..b0f3c28 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -91,6 +91,7 @@ extern const char kDnsPrefetchDisable[];
 extern const char kDomAutomationController[];
 extern const char kDumpHistogramsOnExit[];
 extern const char kEnableAcceleratedCompositing[];
+extern const char kEnableAccelerated2dCanvas[];
 extern const char kEnableAeroPeekTabs[];
 extern const char kEnableApps[];
 extern const char kEnableAuthNegotiatePort[];
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 50b18c0..1eab2cb 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -2049,6 +2049,7 @@ struct ParamTraits<WebPreferences> {
     WriteParam(m, p.experimental_webgl_enabled);
     WriteParam(m, p.show_composited_layer_borders);
     WriteParam(m, p.accelerated_compositing_enabled);
+    WriteParam(m, p.accelerated_2d_canvas_enabled);
     WriteParam(m, p.memory_info_enabled);
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
@@ -2094,6 +2095,7 @@ struct ParamTraits<WebPreferences> {
         ReadParam(m, iter, &p->experimental_webgl_enabled) &&
         ReadParam(m, iter, &p->show_composited_layer_borders) &&
         ReadParam(m, iter, &p->accelerated_compositing_enabled) &&
+        ReadParam(m, iter, &p->accelerated_2d_canvas_enabled) &&
         ReadParam(m, iter, &p->memory_info_enabled);
   }
   static void Log(const param_type& p, std::wstring* l) {
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index 987cef4..b8229a5 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -96,6 +96,9 @@ void WebPreferences::Apply(WebView* web_view) const {
   // Enable gpu-accelerated compositing if requested on the command line.
   settings->setAcceleratedCompositingEnabled(accelerated_compositing_enabled);
 
+  // Enable gpu-accelerated 2d canvas if requested on the command line.
+  settings->setAccelerated2dCanvasEnabled(accelerated_2d_canvas_enabled);
+
   // Enable memory info reporting to page if requested on the command line.
   settings->setMemoryInfoEnabled(memory_info_enabled);
 
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index 3e4f926..2b7f532 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -64,6 +64,7 @@ struct WebPreferences {
   bool experimental_webgl_enabled;
   bool show_composited_layer_borders;
   bool accelerated_compositing_enabled;
+  bool accelerated_2d_canvas_enabled;
   bool enable_html5_parser;
   bool memory_info_enabled;
 
@@ -110,6 +111,7 @@ struct WebPreferences {
         experimental_webgl_enabled(false),
         show_composited_layer_borders(false),
         accelerated_compositing_enabled(false),
+        accelerated_2d_canvas_enabled(false),
         enable_html5_parser(true),
         memory_info_enabled(false) {
   }