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; |
} |