From aed965375dec978e7feb8722b1b94250a2a6e039 Mon Sep 17 00:00:00 2001 From: "dmichael@chromium.org" Date: Sat, 23 Jun 2012 14:27:42 +0000 Subject: PPAPI: Make blocking completion callbacks work. This also makes scoped_refptr the "new" way to pass completion callbacks in an API. This allows the Enter object to handle checking for blocking callbacks on the main thread to report error, and blocking if on the background thread. This way, interfaces don't have to write any special cases for blocking callbacks. When built with enable_pepper_threading=1 locally, URLLoader tests all pass for blocking completion callbacks. I haven't updated all tests yet. BUG=92909 TEST= Review URL: https://chromiumcodereview.appspot.com/10081020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143806 0039d316-1c4b-4281-b951-d872f2087c98 --- ppapi/shared_impl/private/tcp_socket_private_impl.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'ppapi/shared_impl/private/tcp_socket_private_impl.h') diff --git a/ppapi/shared_impl/private/tcp_socket_private_impl.h b/ppapi/shared_impl/private/tcp_socket_private_impl.h index 8038b5c..2792102 100644 --- a/ppapi/shared_impl/private/tcp_socket_private_impl.h +++ b/ppapi/shared_impl/private/tcp_socket_private_impl.h @@ -46,24 +46,25 @@ class PPAPI_SHARED_EXPORT TCPSocketPrivateImpl // PPB_TCPSocket_Private_API implementation. virtual int32_t Connect(const char* host, uint16_t port, - PP_CompletionCallback callback) OVERRIDE; + scoped_refptr callback) OVERRIDE; virtual int32_t ConnectWithNetAddress( const PP_NetAddress_Private* addr, - PP_CompletionCallback callback) OVERRIDE; + scoped_refptr callback) OVERRIDE; virtual PP_Bool GetLocalAddress(PP_NetAddress_Private* local_addr) OVERRIDE; virtual PP_Bool GetRemoteAddress(PP_NetAddress_Private* remote_addr) OVERRIDE; - virtual int32_t SSLHandshake(const char* server_name, - uint16_t server_port, - PP_CompletionCallback callback) OVERRIDE; + virtual int32_t SSLHandshake( + const char* server_name, + uint16_t server_port, + scoped_refptr callback) OVERRIDE; virtual PP_Resource GetServerCertificate() OVERRIDE; virtual PP_Bool AddChainBuildingCertificate(PP_Resource certificate, PP_Bool trusted) OVERRIDE; virtual int32_t Read(char* buffer, int32_t bytes_to_read, - PP_CompletionCallback callback) OVERRIDE; + scoped_refptr callback) OVERRIDE; virtual int32_t Write(const char* buffer, int32_t bytes_to_write, - PP_CompletionCallback callback) OVERRIDE; + scoped_refptr callback) OVERRIDE; virtual void Disconnect() OVERRIDE; // Notifications on operations completion. -- cgit v1.1