summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-14 06:02:16 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-14 06:02:16 +0000
commit3e9680a945e3b4b70c633f41a5de6eb5dcca3051 (patch)
tree001664194da913069061f4cfac29bbeb43919dec
parent640b44fa8d4b550db0614c087766632034c177bf (diff)
downloadchromium_src-3e9680a945e3b4b70c633f41a5de6eb5dcca3051.zip
chromium_src-3e9680a945e3b4b70c633f41a5de6eb5dcca3051.tar.gz
chromium_src-3e9680a945e3b4b70c633f41a5de6eb5dcca3051.tar.bz2
Force accelerated canvas 2d to always be off on Mac
BUG=54197 TEST=none Review URL: http://codereview.chromium.org/3396002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59337 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/tab_contents/render_view_host_delegate_helper.cc5
1 files changed, 5 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 03d0143..01d925f 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -284,8 +284,13 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
command_line.HasSwitch(switches::kShowCompositedLayerBorders);
web_prefs.accelerated_compositing_enabled =
!command_line.HasSwitch(switches::kDisableAcceleratedCompositing);
+ // Force this flag off for mac for now. crbug.com/54197
+#if defined(OS_MACOSX)
+ web_prefs.accelerated_2d_canvas_enabled = false;
+#else
web_prefs.accelerated_2d_canvas_enabled =
!command_line.HasSwitch(switches::kDisableAccelerated2dCanvas);
+#endif
web_prefs.memory_info_enabled =
command_line.HasSwitch(switches::kEnableMemoryInfo);
// The user stylesheet watcher may not exist in a testing profile.