ppapi/proxy/ppapi_command_buffer_proxy.cc - Issue 698463006: Revert of Hold the Pepper proxy lock for all Pepper GL calls.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ppapi/proxy/ppapi_command_buffer_proxy.cc

Issue 698463006: Revert of 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, 1 month 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: 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 86aa3c741bb3e69525a5ce083a336b47854790ed..7a2783a20064415baa55dc52cf01cfcc2a25b07d 100644

--- a/ppapi/proxy/ppapi_command_buffer_proxy.cc

+++ b/ppapi/proxy/ppapi_command_buffer_proxy.cc

@@ -219,10 +219,7 @@

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 »