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

Unified Diff: ppapi/proxy/ppapi_command_buffer_proxy.cc

Issue 774763005: Revert "Hold the Pepper proxy lock for all Pepper GL calls." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « ppapi/proxy/plugin_dispatcher.cc ('k') | ppapi/proxy/proxy_channel.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/ppapi_command_buffer_proxy.cc
diff --git a/ppapi/proxy/ppapi_command_buffer_proxy.cc b/ppapi/proxy/ppapi_command_buffer_proxy.cc
index fd84d01d7b8b411b45531368645396d65ed87a96..95500b4a1ec2591b3829566b6632cc02d4203e22 100644
--- a/ppapi/proxy/ppapi_command_buffer_proxy.cc
+++ b/ppapi/proxy/ppapi_command_buffer_proxy.cc
@@ -219,10 +219,7 @@ int32 PpapiCommandBufferProxy::CreateGpuMemoryBufferImage(
bool PpapiCommandBufferProxy::Send(IPC::Message* msg) {
DCHECK(last_state_.error == gpu::error::kNoError);
- // We need hold the Pepper proxy lock for sync IPC, because GPU command buffer
- // may use a sync IPC with another lock held. It may cause deadlock.
- // http://crbug.com/418651
- if (channel_->SendAndStayLocked(msg))
+ if (channel_->Send(msg))
return true;
last_state_.error = gpu::error::kLostContext;
« no previous file with comments | « ppapi/proxy/plugin_dispatcher.cc ('k') | ppapi/proxy/proxy_channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698