chromium/src
0
Fork 0
Code Activity

Fix a bug in the Broker proxy thunk that breaks the Connect callback when running out-of-process.

Browse Source 
BUG=none
TEST=Use the Broker in an out-of-process plugin. The Connect callback should be received correctly.

Review URL: http://codereview.chromium.org/7066040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87620 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
ddorwin@chromium.org
2011-06-02 17:01:04 +00:00
parent 8c57720482
commit c8c0738ff3
1 changed files with 2 additions and 2 deletions

4
ppapi/proxy/ppb_broker_proxy.cc

@ -6,6 +6,7 @@
#include "ppapi/c/pp_errors.h"
#include "ppapi/c/trusted/ppb_broker_trusted.h"
#include "ppapi/proxy/enter_proxy.h"
#include "ppapi/proxy/plugin_dispatcher.h"
#include "ppapi/proxy/plugin_resource.h"
#include "ppapi/proxy/ppapi_messages.h"
@ -224,8 +225,7 @@ void PPB_Broker_Proxy::OnMsgConnectComplete(
DCHECK(result == PP_OK ||
socket_handle == IPC::InvalidPlatformFileForTransit());
ppapi::thunk::EnterResourceNoLock<ppapi::thunk::PPB_Broker_API> enter(
resource.host_resource(), true);
EnterPluginFromHostResource<ppapi::thunk::PPB_Broker_API> enter(resource);
if (enter.failed()) {
// As in Broker::ConnectComplete, we need to close the resource on error.
base::SyncSocket temp_socket(