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

Unified Diff: content/gpu/gpu_child_thread.cc

Issue 2112493003: Fix racing which may pause gpu process's interface registry forever (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/gpu/gpu_child_thread.cc
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
index b0783c4df312e8b52c5ec32eb6199e1a1f7920d3..a81892212b99691f016740f34d36d04d53904e5c 100644
--- a/content/gpu/gpu_child_thread.cc
+++ b/content/gpu/gpu_child_thread.cc
@@ -303,10 +303,12 @@ bool GpuChildThread::AcceptConnection(shell::Connection* connection) {
// We don't want to process any incoming interface requests until
// OnInitialize().
- connection->GetInterfaceRegistry()->PauseBinding();
- resume_interface_bindings_callback_ = base::Bind(
- &shell::InterfaceRegistry::ResumeBinding,
- connection->GetInterfaceRegistry()->GetWeakPtr());
+ if (!gpu_channel_manager_) {
+ connection->GetInterfaceRegistry()->PauseBinding();
+ resume_interface_bindings_callback_ = base::Bind(
+ &shell::InterfaceRegistry::ResumeBinding,
+ connection->GetInterfaceRegistry()->GetWeakPtr());
+ }
return true;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698