summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-22 19:50:12 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-22 19:50:12 +0000
commit11c4c816a056ad651aefc241446b77f4e57cebd8 (patch)
tree5be663f6af9710ae16d9f16b7fe127aa7258c222 /chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc
parent8a70f2301294c3c4b572b80952edbec5f688cd62 (diff)
downloadchromium_src-11c4c816a056ad651aefc241446b77f4e57cebd8.zip
chromium_src-11c4c816a056ad651aefc241446b77f4e57cebd8.tar.gz
chromium_src-11c4c816a056ad651aefc241446b77f4e57cebd8.tar.bz2
Revert 63535 - Disable GPU features AcceleratingCompositing and WebGL by default.
(This change got checked into trunk only to get merged into M8.) Flags have been switched to reversed logic, and about_flags.cc modified to expose these to users in GUI. BUG=56053, 59092 TEST=Use about:flags to toggle features, confirm state with e.g. http://webglsamples.googlecode.com/hg/aquarium/aquarium.html http://webkit.org/blog-files/3d-transforms/poster-circle.html Vince's change for about:flags. Review URL: http://codereview.chromium.org/3978002 TBR=vangelis@chromium.org Review URL: http://codereview.chromium.org/3974004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63547 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc')
-rw-r--r--chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc
index 3bae57f..1ffd0fe 100644
--- a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc
+++ b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc
@@ -107,8 +107,8 @@ bool WebGraphicsContext3DCommandBufferImpl::initialize(
kWebGraphicsContext3DPerferredGLExtensions,
attribs);
} else {
- bool compositing_enabled = CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableAcceleratedCompositing);
+ bool compositing_enabled = !CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableAcceleratedCompositing);
ggl::Context* parent_context = NULL;
// If GPU compositing is enabled we need to create a GL context that shares
// resources with the compositor's context.