Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(230)

Unified Diff: content/renderer/renderer_main.cc

Issue 1472063007: mustash: enable GPU Compositing in renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address issues. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/renderer_main.cc
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index 8fb158d3182e26fb24b50155296d20330e04ded9..13368c92a04f7e22c52ded693f7febb822833557 100644
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -94,12 +94,13 @@ int RendererMain(const MainFunctionParams& parameters) {
base::trace_event::TraceLog::GetInstance()->SetProcessSortIndex(
kTraceEventRendererProcessSortIndex);
+ const base::CommandLine& parsed_command_line = parameters.command_line;
+
#if defined(MOJO_SHELL_CLIENT)
- MojoShellConnectionImpl::Create();
+ if (parsed_command_line.HasSwitch(switches::kEnableMojoShellConnection))
+ MojoShellConnectionImpl::Create();
#endif
- const base::CommandLine& parsed_command_line = parameters.command_line;
-
#if defined(OS_MACOSX)
base::mac::ScopedNSAutoreleasePool* pool = parameters.autorelease_pool;
#endif // OS_MACOSX

Powered by Google App Engine
This is Rietveld 408576698