content/renderer/render_widget.cc - Issue 1738663002: Hook embedded shell up to MojoShellConnection

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/render_widget.cc

Issue 1738663002: Hook embedded shell up to MojoShellConnection (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: self review Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/renderer/render_widget.cc

diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc

index 3f9d45d624fd1a7b2d000caaf6cef37e85795554..821aeda6fa1cd070d23dc84193ac7fdbee06f5a3 100644

--- a/content/renderer/render_widget.cc

+++ b/content/renderer/render_widget.cc

@@ -703,7 +703,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();