diff options
| author | vangelis@chromium.org <vangelis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-07 17:46:09 +0000 |
|---|---|---|
| committer | vangelis@chromium.org <vangelis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-07 17:46:09 +0000 |
| commit | c0ad0313bafabf5bd7f303cf5f6bd93b653677e8 (patch) | |
| tree | cef3bae882b6418a4c06bf7f06c5dd3607631049 /chrome/renderer | |
| parent | 60159295ccf289e95b1da3120351aa8f9cdf9444 (diff) | |
| download | chromium_src-c0ad0313bafabf5bd7f303cf5f6bd93b653677e8.zip chromium_src-c0ad0313bafabf5bd7f303cf5f6bd93b653677e8.tar.gz chromium_src-c0ad0313bafabf5bd7f303cf5f6bd93b653677e8.tar.bz2 | |
Turning WebGL and the accelerated compositor on by default (linux and windows only for the compositor),
removing the --enable-webgl flag and adding --disable-webgl and --disable-accelerated-compositing.
On the mac --enable-accelerated-compositing still needs to be supplied to enable the compositor.
BUG=54469
Review URL: http://codereview.chromium.org/3342016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58711 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/render_thread.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/render_view.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index 851d931..1a3b424 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -945,7 +945,7 @@ void RenderThread::EnsureWebKitInitialized() { !command_line.HasSwitch(switches::kDisableGeolocation)); WebRuntimeFeatures::enableWebGL( - command_line.HasSwitch(switches::kEnableExperimentalWebGL)); + !command_line.HasSwitch(switches::kDisableExperimentalWebGL)); WebRuntimeFeatures::enablePushState(true); diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 0c2eb5a..4527c23 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -2437,7 +2437,7 @@ WebMediaPlayer* RenderView::createMediaPlayer( } if (cmd_line->HasSwitch(switches::kEnableAcceleratedDecoding) && - cmd_line->HasSwitch(switches::kEnableAcceleratedCompositing)) { + !cmd_line->HasSwitch(switches::kDisableAcceleratedCompositing)) { // Add the hardware video decoder factory. factory->AddFactory(IpcVideoDecoder::CreateFactory( MessageLoop::current(), diff --git a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc index 0c7d966..9a57aa8 100644 --- a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc +++ b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc @@ -40,8 +40,8 @@ WebGraphicsContext3DCommandBufferImpl:: bool WebGraphicsContext3DCommandBufferImpl::initialize( WebGraphicsContext3D::Attributes attributes, WebKit::WebView* web_view) { - 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. |