diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 20:28:31 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 20:28:31 +0000 |
| commit | 7866477b576d9f7aac4df37d3fb787535c374878 (patch) | |
| tree | e370236ae7eaf45d76fb5805ed7b1348293ec0b2 | |
| parent | 4319afa4cd89fcda90965a58164e8d6b7df8594b (diff) | |
| download | chromium_src-7866477b576d9f7aac4df37d3fb787535c374878.zip chromium_src-7866477b576d9f7aac4df37d3fb787535c374878.tar.gz chromium_src-7866477b576d9f7aac4df37d3fb787535c374878.tar.bz2 | |
Disable accelerated 2d canvas flag and about:flags entry on 552
BUG=58941
TEST=launch with --enable-accelerated-2d-canvas, verify that pages with canvas do not start the GPU process
Review URL: http://codereview.chromium.org/4111008
git-svn-id: svn://svn.chromium.org/chrome/branches/552/src@64303 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/about_flags.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/render_view_host_delegate_helper.cc | 3 |
2 files changed, 1 insertions, 9 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index b20a054..d627630 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -143,13 +143,6 @@ const Experiment kExperiments[] = { switches::kEnableAcceleratedCompositing }, { - "gpu-canvas-2d", // Do not change; see above - IDS_FLAGS_ACCELERATED_CANVAS_2D_NAME, - IDS_FLAGS_ACCELERATED_CANVAS_2D_DESCRIPTION, - kOsWin | kOsLinux | kOsCrOS, - switches::kEnableAccelerated2dCanvas - }, - { "webgl", // Do not change; see above IDS_FLAGS_WEBGL_NAME, IDS_FLAGS_WEBGL_DESCRIPTION, 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 c1457f7..753294b 100644 --- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc +++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc @@ -285,8 +285,7 @@ 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.accelerated_2d_canvas_enabled = false; web_prefs.memory_info_enabled = command_line.HasSwitch(switches::kEnableMemoryInfo); web_prefs.hyperlink_auditing_enabled = |