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

Side by Side Diff: ppapi/thunk/ppb_tcp_socket_private_thunk.cc

Issue 8506016: Remove 'Flash' from TCP/UDP Pepper interfaces. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: resolved last comments Created 9 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ppapi/thunk/ppb_tcp_socket_private_api.h ('k') | ppapi/thunk/ppb_udp_socket_private_api.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ppapi/c/pp_completion_callback.h" 5 #include "ppapi/c/pp_completion_callback.h"
6 #include "ppapi/c/pp_errors.h" 6 #include "ppapi/c/pp_errors.h"
7 #include "ppapi/c/private/ppb_flash_tcp_socket.h" 7 #include "ppapi/c/private/ppb_tcp_socket_private.h"
8 #include "ppapi/thunk/common.h" 8 #include "ppapi/thunk/common.h"
9 #include "ppapi/thunk/enter.h" 9 #include "ppapi/thunk/enter.h"
10 #include "ppapi/thunk/thunk.h" 10 #include "ppapi/thunk/thunk.h"
11 #include "ppapi/thunk/ppb_flash_tcp_socket_api.h" 11 #include "ppapi/thunk/ppb_tcp_socket_private_api.h"
12 #include "ppapi/thunk/resource_creation_api.h" 12 #include "ppapi/thunk/resource_creation_api.h"
13 13
14 namespace ppapi { 14 namespace ppapi {
15 namespace thunk { 15 namespace thunk {
16 16
17 namespace { 17 namespace {
18 18
19 PP_Resource Create(PP_Instance instance) { 19 PP_Resource Create(PP_Instance instance) {
20 EnterFunction<ResourceCreationAPI> enter(instance, true); 20 EnterFunction<ResourceCreationAPI> enter(instance, true);
21 if (enter.failed()) 21 if (enter.failed())
22 return 0; 22 return 0;
23 return enter.functions()->CreateFlashTCPSocket(instance); 23 return enter.functions()->CreateTCPSocketPrivate(instance);
24 } 24 }
25 25
26 PP_Bool IsFlashTCPSocket(PP_Resource resource) { 26 PP_Bool IsTCPSocket(PP_Resource resource) {
27 EnterResource<PPB_Flash_TCPSocket_API> enter(resource, false); 27 EnterResource<PPB_TCPSocket_Private_API> enter(resource, false);
28 return PP_FromBool(enter.succeeded()); 28 return PP_FromBool(enter.succeeded());
29 } 29 }
30 30
31 int32_t Connect(PP_Resource tcp_socket, 31 int32_t Connect(PP_Resource tcp_socket,
32 const char* host, 32 const char* host,
33 uint16_t port, 33 uint16_t port,
34 PP_CompletionCallback callback) { 34 PP_CompletionCallback callback) {
35 EnterResource<PPB_Flash_TCPSocket_API> enter(tcp_socket, true); 35 EnterResource<PPB_TCPSocket_Private_API> enter(tcp_socket, true);
36 if (enter.failed()) 36 if (enter.failed())
37 return MayForceCallback(callback, PP_ERROR_BADRESOURCE); 37 return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
38 int32_t result = enter.object()->Connect(host, port, callback); 38 int32_t result = enter.object()->Connect(host, port, callback);
39 return MayForceCallback(callback, result); 39 return MayForceCallback(callback, result);
40 } 40 }
41 41
42 int32_t ConnectWithNetAddress(PP_Resource tcp_socket, 42 int32_t ConnectWithNetAddress(PP_Resource tcp_socket,
43 const PP_NetAddress_Private* addr, 43 const PP_NetAddress_Private* addr,
44 PP_CompletionCallback callback) { 44 PP_CompletionCallback callback) {
45 EnterResource<PPB_Flash_TCPSocket_API> enter(tcp_socket, true); 45 EnterResource<PPB_TCPSocket_Private_API> enter(tcp_socket, true);
46 if (enter.failed()) 46 if (enter.failed())
47 return MayForceCallback(callback, PP_ERROR_BADRESOURCE); 47 return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
48 int32_t result = enter.object()->ConnectWithNetAddress(addr, callback); 48 int32_t result = enter.object()->ConnectWithNetAddress(addr, callback);
49 return MayForceCallback(callback, result); 49 return MayForceCallback(callback, result);
50 } 50 }
51 51
52 PP_Bool GetLocalAddress(PP_Resource tcp_socket, 52 PP_Bool GetLocalAddress(PP_Resource tcp_socket,
53 PP_NetAddress_Private* local_addr) { 53 PP_NetAddress_Private* local_addr) {
54 EnterResource<PPB_Flash_TCPSocket_API> enter(tcp_socket, true); 54 EnterResource<PPB_TCPSocket_Private_API> enter(tcp_socket, true);
55 if (enter.failed()) 55 if (enter.failed())
56 return PP_FALSE; 56 return PP_FALSE;
57 return enter.object()->GetLocalAddress(local_addr); 57 return enter.object()->GetLocalAddress(local_addr);
58 } 58 }
59 59
60 PP_Bool GetRemoteAddress(PP_Resource tcp_socket, 60 PP_Bool GetRemoteAddress(PP_Resource tcp_socket,
61 PP_NetAddress_Private* remote_addr) { 61 PP_NetAddress_Private* remote_addr) {
62 EnterResource<PPB_Flash_TCPSocket_API> enter(tcp_socket, true); 62 EnterResource<PPB_TCPSocket_Private_API> enter(tcp_socket, true);
63 if (enter.failed()) 63 if (enter.failed())
64 return PP_FALSE; 64 return PP_FALSE;
65 return enter.object()->GetRemoteAddress(remote_addr); 65 return enter.object()->GetRemoteAddress(remote_addr);
66 } 66 }
67 67
68 int32_t SSLHandshake(PP_Resource tcp_socket, 68 int32_t SSLHandshake(PP_Resource tcp_socket,
69 const char* server_name, 69 const char* server_name,
70 uint16_t server_port, 70 uint16_t server_port,
71 PP_CompletionCallback callback) { 71 PP_CompletionCallback callback) {
72 EnterResource<PPB_Flash_TCPSocket_API> enter(tcp_socket, true); 72 EnterResource<PPB_TCPSocket_Private_API> enter(tcp_socket, true);
73 if (enter.failed()) 73 if (enter.failed())
74 return MayForceCallback(callback, PP_ERROR_BADRESOURCE); 74 return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
75 int32_t result = enter.object()->SSLHandshake(server_name, server_port, 75 int32_t result = enter.object()->SSLHandshake(server_name, server_port,
76 callback); 76 callback);
77 return MayForceCallback(callback, result); 77 return MayForceCallback(callback, result);
78 } 78 }
79 79
80 int32_t Read(PP_Resource tcp_socket, 80 int32_t Read(PP_Resource tcp_socket,
81 char* buffer, 81 char* buffer,
82 int32_t bytes_to_read, 82 int32_t bytes_to_read,
83 PP_CompletionCallback callback) { 83 PP_CompletionCallback callback) {
84 EnterResource<PPB_Flash_TCPSocket_API> enter(tcp_socket, true); 84 EnterResource<PPB_TCPSocket_Private_API> enter(tcp_socket, true);
85 if (enter.failed()) 85 if (enter.failed())
86 return MayForceCallback(callback, PP_ERROR_BADRESOURCE); 86 return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
87 int32_t result = enter.object()->Read(buffer, bytes_to_read, callback); 87 int32_t result = enter.object()->Read(buffer, bytes_to_read, callback);
88 return MayForceCallback(callback, result); 88 return MayForceCallback(callback, result);
89 } 89 }
90 90
91 int32_t Write(PP_Resource tcp_socket, 91 int32_t Write(PP_Resource tcp_socket,
92 const char* buffer, 92 const char* buffer,
93 int32_t bytes_to_write, 93 int32_t bytes_to_write,
94 PP_CompletionCallback callback) { 94 PP_CompletionCallback callback) {
95 EnterResource<PPB_Flash_TCPSocket_API> enter(tcp_socket, true); 95 EnterResource<PPB_TCPSocket_Private_API> enter(tcp_socket, true);
96 if (enter.failed()) 96 if (enter.failed())
97 return MayForceCallback(callback, PP_ERROR_BADRESOURCE); 97 return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
98 int32_t result = enter.object()->Write(buffer, bytes_to_write, callback); 98 int32_t result = enter.object()->Write(buffer, bytes_to_write, callback);
99 return MayForceCallback(callback, result); 99 return MayForceCallback(callback, result);
100 } 100 }
101 101
102 void Disconnect(PP_Resource tcp_socket) { 102 void Disconnect(PP_Resource tcp_socket) {
103 EnterResource<PPB_Flash_TCPSocket_API> enter(tcp_socket, true); 103 EnterResource<PPB_TCPSocket_Private_API> enter(tcp_socket, true);
104 if (enter.succeeded()) 104 if (enter.succeeded())
105 enter.object()->Disconnect(); 105 enter.object()->Disconnect();
106 } 106 }
107 107
108 const PPB_Flash_TCPSocket g_ppb_flash_tcp_socket_thunk = { 108 const PPB_TCPSocket_Private g_ppb_tcp_socket_thunk = {
109 &Create, 109 &Create,
110 &IsFlashTCPSocket, 110 &IsTCPSocket,
111 &Connect, 111 &Connect,
112 &ConnectWithNetAddress, 112 &ConnectWithNetAddress,
113 &GetLocalAddress, 113 &GetLocalAddress,
114 &GetRemoteAddress, 114 &GetRemoteAddress,
115 &SSLHandshake, 115 &SSLHandshake,
116 &Read, 116 &Read,
117 &Write, 117 &Write,
118 &Disconnect 118 &Disconnect
119 }; 119 };
120 120
121 } // namespace 121 } // namespace
122 122
123 const PPB_Flash_TCPSocket* GetPPB_Flash_TCPSocket_Thunk() { 123 const PPB_TCPSocket_Private* GetPPB_TCPSocket_Private_Thunk() {
124 return &g_ppb_flash_tcp_socket_thunk; 124 return &g_ppb_tcp_socket_thunk;
125 } 125 }
126 126
127 } // namespace thunk 127 } // namespace thunk
128 } // namespace ppapi 128 } // namespace ppapi
129 129
OLDNEW
« no previous file with comments | « ppapi/thunk/ppb_tcp_socket_private_api.h ('k') | ppapi/thunk/ppb_udp_socket_private_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698