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

2 files changed, 5 insertions, 0 deletions

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) {
   }