diff options
| author | vangelis@chromium.org <vangelis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-02 20:46:04 +0000 |
|---|---|---|
| committer | vangelis@chromium.org <vangelis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-02 20:46:04 +0000 |
| commit | 96ccc7ec1f107b74a697ced6d08c4150efb5c297 (patch) | |
| tree | c5ee89dcf66dff38de42250f674221cb9a1c11bf /chrome/browser | |
| parent | 8d893510a0062ef20a6174bd58335a2b11c52b03 (diff) | |
| download | chromium_src-96ccc7ec1f107b74a697ced6d08c4150efb5c297.zip chromium_src-96ccc7ec1f107b74a697ced6d08c4150efb5c297.tar.gz chromium_src-96ccc7ec1f107b74a697ced6d08c4150efb5c297.tar.bz2 | |
Adding a new command line flag (--enable-accelerated-layers) for turning
on the accelerated compositor for 3D CSS, Video, Plugins and Animations.
Also the compositor will now always be enabled for WebGL and accelerated 2D
canvas content.
In addition, added an about:flags entry for the flag using the same name and description as our old "enable accelerated compositing" entry had, however triggering the new flag.
This CL must be checked in after the patch for https://bugs.webkit.org/show_bug.cgi?id=50301 lands.
BUG=64589
Review URL: http://codereview.chromium.org/5421001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68064 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/about_flags.cc | 16 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/render_view_host_delegate_helper.cc | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index fec86c4..b46a101 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -201,15 +201,13 @@ const Experiment kExperiments[] = { kOsMac, SINGLE_VALUE_TYPE(switches::kEnablePredictiveInstant) }, - // FIXME(scheib): Add Flags entry for accelerated Compositing, - // or pull it and the strings in generated_resources.grd by Dec 2010 - // { - // "gpu-compositing", - // IDS_FLAGS_ACCELERATED_COMPOSITING_NAME, - // IDS_FLAGS_ACCELERATED_COMPOSITING_DESCRIPTION, - // kOsAll, - // SINGLE_VALUE_TYPE(switches::kDisableAcceleratedCompositing) - // }, + { + "gpu-compositing", + IDS_FLAGS_ACCELERATED_COMPOSITING_NAME, + IDS_FLAGS_ACCELERATED_COMPOSITING_DESCRIPTION, + kOsAll, + SINGLE_VALUE_TYPE(switches::kEnableAcceleratedLayers) + }, { "gpu-canvas-2d", // FLAGS:RECORD_UMA IDS_FLAGS_ACCELERATED_CANVAS_2D_NAME, 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 707080b3..c7f59ff 100644 --- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc +++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc @@ -287,6 +287,8 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs( web_prefs.accelerated_2d_canvas_enabled = gpu_enabled() && command_line.HasSwitch(switches::kEnableAccelerated2dCanvas); + web_prefs.accelerated_layers_enabled = + command_line.HasSwitch(switches::kEnableAcceleratedLayers); web_prefs.memory_info_enabled = command_line.HasSwitch(switches::kEnableMemoryInfo); web_prefs.hyperlink_auditing_enabled = |