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

Unified Diff: content/browser/gpu/gpu_process_host.cc

Issue 2138263002: Revert of Move content's shell connections to the IO thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/browser/mojo/mojo_child_connection.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/gpu/gpu_process_host.cc
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index ff47de955c4d71c4347c933c63edf7a846e6d53b..8c3a201cc673bc620b7a84c66dc58eebcfd58c06 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -565,9 +565,10 @@
DCHECK(!mojo_child_connection_);
mojo_child_connection_.reset(new MojoChildConnection(
- kGpuMojoApplicationName, "", child_token_,
- MojoShellContext::GetConnectorForIOThread(),
- BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)));
+ kGpuMojoApplicationName,
+ "",
+ child_token_,
+ MojoShellContext::GetConnectorForIOThread()));
gpu::GpuPreferences gpu_preferences = GetGpuPreferencesFromCommandLine();
if (in_process_) {
@@ -938,11 +939,11 @@
}
shell::InterfaceRegistry* GpuProcessHost::GetInterfaceRegistry() {
- return mojo_child_connection_->GetInterfaceRegistry();
+ return mojo_child_connection_->connection()->GetInterfaceRegistry();
}
shell::InterfaceProvider* GpuProcessHost::GetRemoteInterfaces() {
- return mojo_child_connection_->GetRemoteInterfaces();
+ return mojo_child_connection_->connection()->GetRemoteInterfaces();
}
GpuProcessHost::GpuProcessKind GpuProcessHost::kind() {
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | content/browser/mojo/mojo_child_connection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698