Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3316)

Unified Diff: ppapi/thunk/ppb_flash_tcp_socket_thunk.cc

Issue 7535007: Implement PPB_Flash_TCPSocket.InitiateSSL. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: . Created 9 years, 4 months 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
« no previous file with comments | « ppapi/thunk/ppb_flash_tcp_socket_api.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/thunk/ppb_flash_tcp_socket_thunk.cc
diff --git a/ppapi/thunk/ppb_flash_tcp_socket_thunk.cc b/ppapi/thunk/ppb_flash_tcp_socket_thunk.cc
index 6154d602035615b97bc41242741aa9c921b60ab4..a1ce67ea31ee7640d1761a1c84ae44dd8b7f7cba 100644
--- a/ppapi/thunk/ppb_flash_tcp_socket_thunk.cc
+++ b/ppapi/thunk/ppb_flash_tcp_socket_thunk.cc
@@ -65,13 +65,15 @@ PP_Bool GetRemoteAddress(PP_Resource tcp_socket,
return enter.object()->GetRemoteAddress(remote_addr);
}
-int32_t InitiateSSL(PP_Resource tcp_socket,
- const char* server_name,
- PP_CompletionCallback callback) {
+int32_t SSLHandshake(PP_Resource tcp_socket,
+ const char* server_name,
+ uint16_t server_port,
+ PP_CompletionCallback callback) {
EnterResource<PPB_Flash_TCPSocket_API> enter(tcp_socket, true);
if (enter.failed())
return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
- int32_t result = enter.object()->InitiateSSL(server_name, callback);
+ int32_t result = enter.object()->SSLHandshake(server_name, server_port,
+ callback);
return MayForceCallback(callback, result);
}
@@ -110,7 +112,7 @@ const PPB_Flash_TCPSocket g_ppb_flash_tcp_socket_thunk = {
&ConnectWithNetAddress,
&GetLocalAddress,
&GetRemoteAddress,
- &InitiateSSL,
+ &SSLHandshake,
&Read,
&Write,
&Disconnect
« no previous file with comments | « ppapi/thunk/ppb_flash_tcp_socket_api.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698