diff options
| author | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-02 17:01:04 +0000 |
|---|---|---|
| committer | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-02 17:01:04 +0000 |
| commit | c8c0738ff3d0debacd716400e9a1f516133b36d6 (patch) | |
| tree | 81f6b6172625fad9756e5c56a4d2ca8009d0cd0b /ppapi | |
| parent | 8c57720482c0d5909e82b090e1d839fce2d70a82 (diff) | |
| download | chromium_src-c8c0738ff3d0debacd716400e9a1f516133b36d6.zip chromium_src-c8c0738ff3d0debacd716400e9a1f516133b36d6.tar.gz chromium_src-c8c0738ff3d0debacd716400e9a1f516133b36d6.tar.bz2 | |
Fix a bug in the Broker proxy thunk that breaks the Connect callback when running out-of-process.
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
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/proxy/ppb_broker_proxy.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ppapi/proxy/ppb_broker_proxy.cc b/ppapi/proxy/ppb_broker_proxy.cc index 97fe0d0..fd789de 100644 --- a/ppapi/proxy/ppb_broker_proxy.cc +++ b/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( |