| Index: content/renderer/render_widget.cc
|
| diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
|
| index 1b911e4b3506eeacc156b974b171e10d9e718a7a..888a9f1baf6d5bb12814831dce26e9ac1de5d1a9 100644
|
| --- a/content/renderer/render_widget.cc
|
| +++ b/content/renderer/render_widget.cc
|
| @@ -705,7 +705,8 @@ scoped_ptr<cc::OutputSurface> RenderWidget::CreateOutputSurface(bool fallback) {
|
| use_software = true;
|
|
|
| #if defined(MOJO_SHELL_CLIENT)
|
| - if (MojoShellConnection::Get() && !use_software) {
|
| + if (MojoShellConnection::Get() && !use_software &&
|
| + command_line.HasSwitch(switches::kUseMusInRenderer)) {
|
| RenderWidgetMusConnection* connection =
|
| RenderWidgetMusConnection::GetOrCreate(routing_id());
|
| return connection->CreateOutputSurface();
|
|
|