diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-14 07:01:35 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-14 07:01:35 +0000 |
| commit | 8a6461cf71bd1401e9b551d30818bfe39a2e4061 (patch) | |
| tree | 2a83806b518156ccd5a7a83d86b04101106874d2 /chrome/browser/tab_contents | |
| parent | 57178412adb0406166c6637dfc60de0d55fcebd9 (diff) | |
| download | chromium_src-8a6461cf71bd1401e9b551d30818bfe39a2e4061.zip chromium_src-8a6461cf71bd1401e9b551d30818bfe39a2e4061.tar.gz chromium_src-8a6461cf71bd1401e9b551d30818bfe39a2e4061.tar.bz2 | |
Revert 59324 and 59337. Too many test failures
BUG=none
TEST=none
TBR=darin
Review URL: http://codereview.chromium.org/3431001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59341 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/render_view_host_delegate_helper.cc | 7 |
1 files changed, 1 insertions, 6 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 01d925f..0dddcc6 100644 --- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc +++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc @@ -284,13 +284,8 @@ 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 + 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. |