diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-16 20:10:55 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-16 20:10:55 +0000 |
| commit | e655a951994dcafb7203d6824b90dfef6e445dca (patch) | |
| tree | 18b9126b21efd9e63f74149263753031ec393ae8 /ppapi/proxy/ppb_flash_tcp_socket_proxy.cc | |
| parent | c96312d46205ea82764aba6255ecbb8dd5f57d11 (diff) | |
| download | chromium_src-e655a951994dcafb7203d6824b90dfef6e445dca.zip chromium_src-e655a951994dcafb7203d6824b90dfef6e445dca.tar.gz chromium_src-e655a951994dcafb7203d6824b90dfef6e445dca.tar.bz2 | |
Add a new error code for a null callback on the main thread.
Convert the NaCl and ChromeIPC proxies to use the new value.
Review URL: http://codereview.chromium.org/7885014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101556 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppb_flash_tcp_socket_proxy.cc')
| -rw-r--r-- | ppapi/proxy/ppb_flash_tcp_socket_proxy.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/ppapi/proxy/ppb_flash_tcp_socket_proxy.cc b/ppapi/proxy/ppb_flash_tcp_socket_proxy.cc index 7ff2ce3..020cf28 100644 --- a/ppapi/proxy/ppb_flash_tcp_socket_proxy.cc +++ b/ppapi/proxy/ppb_flash_tcp_socket_proxy.cc @@ -209,8 +209,10 @@ PP_Bool FlashTCPSocket::GetRemoteAddress(PP_Flash_NetAddress* remote_addr) { int32_t FlashTCPSocket::SSLHandshake(const char* server_name, uint16_t server_port, PP_CompletionCallback callback) { - if (!server_name || !callback.func) + if (!server_name) return PP_ERROR_BADARGUMENT; + if (!callback.func) + return PP_ERROR_BLOCKS_MAIN_THREAD; if (connection_state_ != CONNECTED) return PP_ERROR_FAILED; @@ -230,8 +232,10 @@ int32_t FlashTCPSocket::SSLHandshake(const char* server_name, int32_t FlashTCPSocket::Read(char* buffer, int32_t bytes_to_read, PP_CompletionCallback callback) { - if (!buffer || bytes_to_read <= 0 || !callback.func) + if (!buffer || bytes_to_read <= 0) return PP_ERROR_BADARGUMENT; + if (!callback.func) + return PP_ERROR_BLOCKS_MAIN_THREAD; if (!IsConnected()) return PP_ERROR_FAILED; @@ -251,8 +255,10 @@ int32_t FlashTCPSocket::Read(char* buffer, int32_t FlashTCPSocket::Write(const char* buffer, int32_t bytes_to_write, PP_CompletionCallback callback) { - if (!buffer || bytes_to_write <= 0 || !callback.func) + if (!buffer || bytes_to_write <= 0) return PP_ERROR_BADARGUMENT; + if (!callback.func) + return PP_ERROR_BLOCKS_MAIN_THREAD; if (!IsConnected()) return PP_ERROR_FAILED; @@ -365,7 +371,7 @@ int32_t FlashTCPSocket::ConnectWithMessage(IPC::Message* msg, PP_CompletionCallback callback) { scoped_ptr<IPC::Message> msg_deletor(msg); if (!callback.func) - return PP_ERROR_BADARGUMENT; + return PP_ERROR_BLOCKS_MAIN_THREAD; if (connection_state_ != BEFORE_CONNECT) return PP_ERROR_FAILED; if (connect_callback_.func) |