summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy
diff options
context:
space:
mode:
Diffstat (limited to 'ppapi/proxy')
-rw-r--r--ppapi/proxy/interface_list.cc14
-rw-r--r--ppapi/proxy/ppapi_messages.h12
-rw-r--r--ppapi/proxy/ppapi_param_traits.cc17
-rw-r--r--ppapi/proxy/ppapi_param_traits.h6
-rw-r--r--ppapi/proxy/ppb_flash_net_connector_proxy.cc42
-rw-r--r--ppapi/proxy/ppb_flash_tcp_socket_proxy.cc28
-rw-r--r--ppapi/proxy/ppb_flash_tcp_socket_proxy.h4
-rw-r--r--ppapi/proxy/ppb_flash_udp_socket_proxy.cc21
-rw-r--r--ppapi/proxy/ppb_flash_udp_socket_proxy.h2
9 files changed, 73 insertions, 73 deletions
diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc
index 269aa6e..c1f1b9f 100644
--- a/ppapi/proxy/interface_list.cc
+++ b/ppapi/proxy/interface_list.cc
@@ -11,9 +11,9 @@
#include "ppapi/c/dev/ppb_context_3d_dev.h"
#include "ppapi/c/dev/ppb_crypto_dev.h"
#include "ppapi/c/dev/ppb_cursor_control_dev.h"
-#include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h"
#include "ppapi/c/dev/ppb_font_dev.h"
#include "ppapi/c/dev/ppb_fullscreen_dev.h"
+#include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h"
#include "ppapi/c/dev/ppb_ime_input_event_dev.h"
#include "ppapi/c/dev/ppb_memory_dev.h"
#include "ppapi/c/dev/ppb_surface_3d_dev.h"
@@ -22,9 +22,8 @@
#include "ppapi/c/dev/ppb_url_util_dev.h"
#include "ppapi/c/dev/ppb_var_deprecated.h"
#include "ppapi/c/dev/ppb_video_capture_dev.h"
-#include "ppapi/c/pp_errors.h"
-#include "ppapi/c/ppb_audio.h"
#include "ppapi/c/ppb_audio_config.h"
+#include "ppapi/c/ppb_audio.h"
#include "ppapi/c/ppb_core.h"
#include "ppapi/c/ppb_file_ref.h"
#include "ppapi/c/ppb_file_system.h"
@@ -40,16 +39,17 @@
#include "ppapi/c/ppb_url_request_info.h"
#include "ppapi/c/ppb_url_response_info.h"
#include "ppapi/c/ppb_var.h"
+#include "ppapi/c/pp_errors.h"
#include "ppapi/c/ppp_instance.h"
-#include "ppapi/c/private/ppb_flash.h"
#include "ppapi/c/private/ppb_flash_clipboard.h"
#include "ppapi/c/private/ppb_flash_file.h"
#include "ppapi/c/private/ppb_flash_fullscreen.h"
+#include "ppapi/c/private/ppb_flash.h"
#include "ppapi/c/private/ppb_flash_menu.h"
-#include "ppapi/c/private/ppb_flash_net_address.h"
#include "ppapi/c/private/ppb_flash_net_connector.h"
#include "ppapi/c/private/ppb_flash_tcp_socket.h"
#include "ppapi/c/private/ppb_flash_udp_socket.h"
+#include "ppapi/c/private/ppb_net_address_private.h"
#include "ppapi/c/private/ppb_pdf.h"
#include "ppapi/c/trusted/ppb_broker_trusted.h"
#include "ppapi/c/trusted/ppb_url_loader_trusted.h"
@@ -65,9 +65,9 @@
#include "ppapi/proxy/ppb_file_system_proxy.h"
#include "ppapi/proxy/ppb_flash_clipboard_proxy.h"
#include "ppapi/proxy/ppb_flash_file_proxy.h"
-#include "ppapi/proxy/ppb_flash_proxy.h"
#include "ppapi/proxy/ppb_flash_menu_proxy.h"
#include "ppapi/proxy/ppb_flash_net_connector_proxy.h"
+#include "ppapi/proxy/ppb_flash_proxy.h"
#include "ppapi/proxy/ppb_flash_tcp_socket_proxy.h"
#include "ppapi/proxy/ppb_flash_udp_socket_proxy.h"
#include "ppapi/proxy/ppb_font_proxy.h"
@@ -75,7 +75,6 @@
#include "ppapi/proxy/ppb_graphics_3d_proxy.h"
#include "ppapi/proxy/ppb_image_data_proxy.h"
#include "ppapi/proxy/ppb_instance_proxy.h"
-#include "ppapi/proxy/ppp_mouse_lock_proxy.h"
#include "ppapi/proxy/ppb_pdf_proxy.h"
#include "ppapi/proxy/ppb_surface_3d_proxy.h"
#include "ppapi/proxy/ppb_testing_proxy.h"
@@ -92,6 +91,7 @@
#include "ppapi/proxy/ppp_instance_private_proxy.h"
#include "ppapi/proxy/ppp_instance_proxy.h"
#include "ppapi/proxy/ppp_messaging_proxy.h"
+#include "ppapi/proxy/ppp_mouse_lock_proxy.h"
#include "ppapi/proxy/ppp_video_decoder_proxy.h"
#include "ppapi/proxy/resource_creation_proxy.h"
#include "ppapi/shared_impl/opengles2_impl.h"
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
index 11ca77a..a66b2b2 100644
--- a/ppapi/proxy/ppapi_messages.h
+++ b/ppapi/proxy/ppapi_messages.h
@@ -256,8 +256,8 @@ IPC_MESSAGE_ROUTED5(PpapiMsg_PPBFlashTCPSocket_ConnectACK,
uint32 /* plugin_dispatcher_id */,
uint32 /* socket_id */,
bool /* succeeded */,
- PP_Flash_NetAddress /* local_addr */,
- PP_Flash_NetAddress /* remote_addr */)
+ PP_NetAddress_Private /* local_addr */,
+ PP_NetAddress_Private /* remote_addr */)
IPC_MESSAGE_ROUTED3(PpapiMsg_PPBFlashTCPSocket_SSLHandshakeACK,
uint32 /* plugin_dispatcher_id */,
uint32 /* socket_id */,
@@ -283,7 +283,7 @@ IPC_MESSAGE_ROUTED5(PpapiMsg_PPBFlashUDPSocket_RecvFromACK,
uint32 /* socket_id */,
bool /* succeeded */,
std::string /* data */,
- PP_Flash_NetAddress /* remote_addr */)
+ PP_NetAddress_Private /* remote_addr */)
IPC_MESSAGE_ROUTED4(PpapiMsg_PPBFlashUDPSocket_SendToACK,
uint32 /* plugin_dispatcher_id */,
uint32 /* socket_id */,
@@ -748,7 +748,7 @@ IPC_MESSAGE_CONTROL3(PpapiHostMsg_PPBFlashTCPSocket_Connect,
uint16_t /* port */)
IPC_MESSAGE_CONTROL2(PpapiHostMsg_PPBFlashTCPSocket_ConnectWithNetAddress,
uint32 /* socket_id */,
- PP_Flash_NetAddress /* net_addr */)
+ PP_NetAddress_Private /* net_addr */)
IPC_MESSAGE_CONTROL3(PpapiHostMsg_PPBFlashTCPSocket_SSLHandshake,
uint32 /* socket_id */,
std::string /* server_name */,
@@ -769,14 +769,14 @@ IPC_SYNC_MESSAGE_CONTROL2_1(PpapiHostMsg_PPBFlashUDPSocket_Create,
uint32 /* socket_id */)
IPC_MESSAGE_CONTROL2(PpapiHostMsg_PPBFlashUDPSocket_Bind,
uint32 /* socket_id */,
- PP_Flash_NetAddress /* net_addr */)
+ PP_NetAddress_Private /* net_addr */)
IPC_MESSAGE_CONTROL2(PpapiHostMsg_PPBFlashUDPSocket_RecvFrom,
uint32 /* socket_id */,
int32_t /* num_bytes */)
IPC_MESSAGE_CONTROL3(PpapiHostMsg_PPBFlashUDPSocket_SendTo,
uint32 /* socket_id */,
std::string /* data */,
- PP_Flash_NetAddress /* net_addr */)
+ PP_NetAddress_Private /* net_addr */)
IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBFlashUDPSocket_Close,
uint32 /* socket_id */)
diff --git a/ppapi/proxy/ppapi_param_traits.cc b/ppapi/proxy/ppapi_param_traits.cc
index acd1fdd..ac66648 100644
--- a/ppapi/proxy/ppapi_param_traits.cc
+++ b/ppapi/proxy/ppapi_param_traits.cc
@@ -136,18 +136,19 @@ bool ParamTraits<PP_FileInfo>::Read(const Message* m, void** iter,
void ParamTraits<PP_FileInfo>::Log(const param_type& p, std::string* l) {
}
-// PP_Flash_NetAddress ---------------------------------------------------------
+// PP_NetAddress_Private -------------------------------------------------------
// static
-void ParamTraits<PP_Flash_NetAddress>::Write(Message* m, const param_type& p) {
+void ParamTraits<PP_NetAddress_Private>::Write(Message* m,
+ const param_type& p) {
WriteParam(m, p.size);
m->WriteBytes(p.data, static_cast<int>(p.size));
}
// static
-bool ParamTraits<PP_Flash_NetAddress>::Read(const Message* m,
- void** iter,
- param_type* p) {
+bool ParamTraits<PP_NetAddress_Private>::Read(const Message* m,
+ void** iter,
+ param_type* p) {
uint16 size;
if (!ReadParam(m, iter, &size))
return false;
@@ -163,9 +164,9 @@ bool ParamTraits<PP_Flash_NetAddress>::Read(const Message* m,
}
// static
-void ParamTraits<PP_Flash_NetAddress>::Log(const param_type& p,
- std::string* l) {
- l->append("<PP_Flash_NetAddress (");
+void ParamTraits<PP_NetAddress_Private>::Log(const param_type& p,
+ std::string* l) {
+ l->append("<PP_NetAddress_Private (");
LogParam(p.size, l);
l->append(" bytes)>");
}
diff --git a/ppapi/proxy/ppapi_param_traits.h b/ppapi/proxy/ppapi_param_traits.h
index 0c2ab5b..83d2988 100644
--- a/ppapi/proxy/ppapi_param_traits.h
+++ b/ppapi/proxy/ppapi_param_traits.h
@@ -19,7 +19,7 @@
struct PP_FileInfo;
struct PP_ObjectProperty;
struct PP_Flash_Menu;
-struct PP_Flash_NetAddress;
+struct PP_NetAddress_Private;
namespace ppapi {
@@ -57,8 +57,8 @@ struct ParamTraits<PP_FileInfo> {
};
template <>
-struct PPAPI_PROXY_EXPORT ParamTraits<PP_Flash_NetAddress> {
- typedef PP_Flash_NetAddress param_type;
+struct PPAPI_PROXY_EXPORT ParamTraits<PP_NetAddress_Private> {
+ typedef PP_NetAddress_Private param_type;
static void Write(Message* m, const param_type& p);
static bool Read(const Message* m, void** iter, param_type* p);
static void Log(const param_type& p, std::string* l);
diff --git a/ppapi/proxy/ppb_flash_net_connector_proxy.cc b/ppapi/proxy/ppb_flash_net_connector_proxy.cc
index 2731cfb..50b205b 100644
--- a/ppapi/proxy/ppb_flash_net_connector_proxy.cc
+++ b/ppapi/proxy/ppb_flash_net_connector_proxy.cc
@@ -24,12 +24,12 @@ using ppapi::thunk::ResourceCreationAPI;
namespace ppapi {
namespace proxy {
-std::string NetAddressToString(const PP_Flash_NetAddress& addr) {
+std::string NetAddressToString(const PP_NetAddress_Private& addr) {
return std::string(addr.data, std::min(static_cast<size_t>(addr.size),
sizeof(addr.data)));
}
-void StringToNetAddress(const std::string& str, PP_Flash_NetAddress* addr) {
+void StringToNetAddress(const std::string& str, PP_NetAddress_Private* addr) {
addr->size = std::min(str.size(), sizeof(addr->data));
memcpy(addr->data, str.data(), addr->size);
}
@@ -60,13 +60,13 @@ class FlashNetConnector : public PPB_Flash_NetConnector_API,
virtual int32_t ConnectTcp(const char* host,
uint16_t port,
PP_FileHandle* socket_out,
- PP_Flash_NetAddress* local_addr_out,
- PP_Flash_NetAddress* remote_addr_out,
+ PP_NetAddress_Private* local_addr_out,
+ PP_NetAddress_Private* remote_addr_out,
PP_CompletionCallback callback) OVERRIDE;
- virtual int32_t ConnectTcpAddress(const PP_Flash_NetAddress* addr,
+ virtual int32_t ConnectTcpAddress(const PP_NetAddress_Private* addr,
PP_FileHandle* socket_out,
- PP_Flash_NetAddress* local_addr_out,
- PP_Flash_NetAddress* remote_addr_out,
+ PP_NetAddress_Private* local_addr_out,
+ PP_NetAddress_Private* remote_addr_out,
PP_CompletionCallback callback) OVERRIDE;
void ConnectComplete(int32_t result,
@@ -79,14 +79,14 @@ class FlashNetConnector : public PPB_Flash_NetConnector_API,
// the message is passed in (on error, it's deleted).
int32_t ConnectWithMessage(IPC::Message* msg,
PP_FileHandle* socket_out,
- PP_Flash_NetAddress* local_addr_out,
- PP_Flash_NetAddress* remote_addr_out,
+ PP_NetAddress_Private* local_addr_out,
+ PP_NetAddress_Private* remote_addr_out,
PP_CompletionCallback callback);
PP_CompletionCallback callback_;
PP_FileHandle* socket_out_;
- PP_Flash_NetAddress* local_addr_out_;
- PP_Flash_NetAddress* remote_addr_out_;
+ PP_NetAddress_Private* local_addr_out_;
+ PP_NetAddress_Private* remote_addr_out_;
};
FlashNetConnector::FlashNetConnector(const HostResource& resource)
@@ -112,8 +112,8 @@ int32_t FlashNetConnector::ConnectTcp(
const char* host,
uint16_t port,
PP_FileHandle* socket_out,
- PP_Flash_NetAddress* local_addr_out,
- PP_Flash_NetAddress* remote_addr_out,
+ PP_NetAddress_Private* local_addr_out,
+ PP_NetAddress_Private* remote_addr_out,
PP_CompletionCallback callback) {
return ConnectWithMessage(
new PpapiHostMsg_PPBFlashNetConnector_ConnectTcp(
@@ -122,10 +122,10 @@ int32_t FlashNetConnector::ConnectTcp(
}
int32_t FlashNetConnector::ConnectTcpAddress(
- const PP_Flash_NetAddress* addr,
+ const PP_NetAddress_Private* addr,
PP_FileHandle* socket_out,
- PP_Flash_NetAddress* local_addr_out,
- PP_Flash_NetAddress* remote_addr_out,
+ PP_NetAddress_Private* local_addr_out,
+ PP_NetAddress_Private* remote_addr_out,
PP_CompletionCallback callback) {
return ConnectWithMessage(
new PpapiHostMsg_PPBFlashNetConnector_ConnectTcpAddress(
@@ -154,8 +154,8 @@ void FlashNetConnector::ConnectComplete(
int32_t FlashNetConnector::ConnectWithMessage(
IPC::Message* msg,
PP_FileHandle* socket_out,
- PP_Flash_NetAddress* local_addr_out,
- PP_Flash_NetAddress* remote_addr_out,
+ PP_NetAddress_Private* local_addr_out,
+ PP_NetAddress_Private* remote_addr_out,
PP_CompletionCallback callback) {
scoped_ptr<IPC::Message> msg_deletor(msg);
if (callback_.func != NULL)
@@ -183,8 +183,8 @@ struct PPB_Flash_NetConnector_Proxy::ConnectCallbackInfo {
HostResource resource;
PP_FileHandle handle;
- PP_Flash_NetAddress local_addr;
- PP_Flash_NetAddress remote_addr;
+ PP_NetAddress_Private local_addr;
+ PP_NetAddress_Private remote_addr;
};
PPB_Flash_NetConnector_Proxy::PPB_Flash_NetConnector_Proxy(
@@ -263,7 +263,7 @@ void PPB_Flash_NetConnector_Proxy::OnMsgConnectTcpAddress(
pp::CompletionCallback callback = callback_factory_.NewOptionalCallback(
&PPB_Flash_NetConnector_Proxy::OnCompleteCallbackInHost, info);
- PP_Flash_NetAddress net_address;
+ PP_NetAddress_Private net_address;
StringToNetAddress(net_address_as_string, &net_address);
EnterHostFromHostResource<PPB_Flash_NetConnector_API> enter(resource);
diff --git a/ppapi/proxy/ppb_flash_tcp_socket_proxy.cc b/ppapi/proxy/ppb_flash_tcp_socket_proxy.cc
index 0d5d6a5..dc1bd9a 100644
--- a/ppapi/proxy/ppb_flash_tcp_socket_proxy.cc
+++ b/ppapi/proxy/ppb_flash_tcp_socket_proxy.cc
@@ -65,10 +65,10 @@ class FlashTCPSocket : public PPB_Flash_TCPSocket_API,
uint16_t port,
PP_CompletionCallback callback) OVERRIDE;
virtual int32_t ConnectWithNetAddress(
- const PP_Flash_NetAddress* addr,
+ const PP_NetAddress_Private* addr,
PP_CompletionCallback callback) OVERRIDE;
- virtual PP_Bool GetLocalAddress(PP_Flash_NetAddress* local_addr) OVERRIDE;
- virtual PP_Bool GetRemoteAddress(PP_Flash_NetAddress* remote_addr) 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;
@@ -82,8 +82,8 @@ class FlashTCPSocket : public PPB_Flash_TCPSocket_API,
// Notifications from the proxy.
void OnConnectCompleted(bool succeeded,
- const PP_Flash_NetAddress& local_addr,
- const PP_Flash_NetAddress& remote_addr);
+ const PP_NetAddress_Private& local_addr,
+ const PP_NetAddress_Private& remote_addr);
void OnSSLHandshakeCompleted(bool succeeded);
void OnReadCompleted(bool succeeded, const std::string& data);
void OnWriteCompleted(bool succeeded, int32_t bytes_written);
@@ -126,8 +126,8 @@ class FlashTCPSocket : public PPB_Flash_TCPSocket_API,
char* read_buffer_;
int32_t bytes_to_read_;
- PP_Flash_NetAddress local_addr_;
- PP_Flash_NetAddress remote_addr_;
+ PP_NetAddress_Private local_addr_;
+ PP_NetAddress_Private remote_addr_;
DISALLOW_COPY_AND_ASSIGN(FlashTCPSocket);
};
@@ -175,7 +175,7 @@ int32_t FlashTCPSocket::Connect(const char* host,
}
int32_t FlashTCPSocket::ConnectWithNetAddress(
- const PP_Flash_NetAddress* addr,
+ const PP_NetAddress_Private* addr,
PP_CompletionCallback callback) {
if (!addr)
return PP_ERROR_BADARGUMENT;
@@ -186,7 +186,7 @@ int32_t FlashTCPSocket::ConnectWithNetAddress(
callback);
}
-PP_Bool FlashTCPSocket::GetLocalAddress(PP_Flash_NetAddress* local_addr) {
+PP_Bool FlashTCPSocket::GetLocalAddress(PP_NetAddress_Private* local_addr) {
if (!IsConnected() || !local_addr)
return PP_FALSE;
@@ -194,7 +194,7 @@ PP_Bool FlashTCPSocket::GetLocalAddress(PP_Flash_NetAddress* local_addr) {
return PP_TRUE;
}
-PP_Bool FlashTCPSocket::GetRemoteAddress(PP_Flash_NetAddress* remote_addr) {
+PP_Bool FlashTCPSocket::GetRemoteAddress(PP_NetAddress_Private* remote_addr) {
if (!IsConnected() || !remote_addr)
return PP_FALSE;
@@ -297,8 +297,8 @@ void FlashTCPSocket::Disconnect() {
void FlashTCPSocket::OnConnectCompleted(
bool succeeded,
- const PP_Flash_NetAddress& local_addr,
- const PP_Flash_NetAddress& remote_addr) {
+ const PP_NetAddress_Private& local_addr,
+ const PP_NetAddress_Private& remote_addr) {
if (connection_state_ != BEFORE_CONNECT || !connect_callback_.func) {
NOTREACHED();
return;
@@ -431,8 +431,8 @@ void PPB_Flash_TCPSocket_Proxy::OnMsgConnectACK(
uint32 /* plugin_dispatcher_id */,
uint32 socket_id,
bool succeeded,
- const PP_Flash_NetAddress& local_addr,
- const PP_Flash_NetAddress& remote_addr) {
+ const PP_NetAddress_Private& local_addr,
+ const PP_NetAddress_Private& remote_addr) {
if (!g_id_to_socket) {
NOTREACHED();
return;
diff --git a/ppapi/proxy/ppb_flash_tcp_socket_proxy.h b/ppapi/proxy/ppb_flash_tcp_socket_proxy.h
index 3344f2c..f20f15e 100644
--- a/ppapi/proxy/ppb_flash_tcp_socket_proxy.h
+++ b/ppapi/proxy/ppb_flash_tcp_socket_proxy.h
@@ -39,8 +39,8 @@ class PPB_Flash_TCPSocket_Proxy : public InterfaceProxy {
void OnMsgConnectACK(uint32 plugin_dispatcher_id,
uint32 socket_id,
bool succeeded,
- const PP_Flash_NetAddress& local_addr,
- const PP_Flash_NetAddress& remote_addr);
+ const PP_NetAddress_Private& local_addr,
+ const PP_NetAddress_Private& remote_addr);
void OnMsgSSLHandshakeACK(uint32 plugin_dispatcher_id,
uint32 socket_id,
bool succeeded);
diff --git a/ppapi/proxy/ppb_flash_udp_socket_proxy.cc b/ppapi/proxy/ppb_flash_udp_socket_proxy.cc
index 43a607c..8988e87 100644
--- a/ppapi/proxy/ppb_flash_udp_socket_proxy.cc
+++ b/ppapi/proxy/ppb_flash_udp_socket_proxy.cc
@@ -59,16 +59,16 @@ class FlashUDPSocket : public PPB_Flash_UDPSocket_API,
virtual PPB_Flash_UDPSocket_API* AsPPB_Flash_UDPSocket_API() OVERRIDE;
// PPB_Flash_UDPSocket_API implementation.
- virtual int32_t Bind(const PP_Flash_NetAddress* addr,
+ virtual int32_t Bind(const PP_NetAddress_Private* addr,
PP_CompletionCallback callback) OVERRIDE;
virtual int32_t RecvFrom(char* buffer,
int32_t num_bytes,
PP_CompletionCallback callback) OVERRIDE;
- virtual PP_Bool GetRecvFromAddress(PP_Flash_NetAddress* addr) OVERRIDE;
+ virtual PP_Bool GetRecvFromAddress(PP_NetAddress_Private* addr) OVERRIDE;
virtual int32_t SendTo(const char* buffer,
int32_t num_bytes,
- const PP_Flash_NetAddress* addr,
+ const PP_NetAddress_Private* addr,
PP_CompletionCallback callback) OVERRIDE;
virtual void Close() OVERRIDE;
@@ -76,7 +76,7 @@ class FlashUDPSocket : public PPB_Flash_UDPSocket_API,
void OnBindCompleted(bool succeeded);
void OnRecvFromCompleted(bool succeeded,
const std::string& data,
- const PP_Flash_NetAddress& addr);
+ const PP_NetAddress_Private& addr);
void OnSendToCompleted(bool succeeded,
int32_t bytes_written);
@@ -99,7 +99,7 @@ class FlashUDPSocket : public PPB_Flash_UDPSocket_API,
char* read_buffer_;
int32_t bytes_to_read_;
- PP_Flash_NetAddress recvfrom_addr_;
+ PP_NetAddress_Private recvfrom_addr_;
DISALLOW_COPY_AND_ASSIGN(FlashUDPSocket);
};
@@ -134,7 +134,7 @@ PPB_Flash_UDPSocket_API* FlashUDPSocket::AsPPB_Flash_UDPSocket_API() {
return this;
}
-int32_t FlashUDPSocket::Bind(const PP_Flash_NetAddress* addr,
+int32_t FlashUDPSocket::Bind(const PP_NetAddress_Private* addr,
PP_CompletionCallback callback) {
if (!addr || !callback.func)
return PP_ERROR_BADARGUMENT;
@@ -172,7 +172,7 @@ int32_t FlashUDPSocket::RecvFrom(char* buffer,
return PP_OK_COMPLETIONPENDING;
}
-PP_Bool FlashUDPSocket::GetRecvFromAddress(PP_Flash_NetAddress* addr) {
+PP_Bool FlashUDPSocket::GetRecvFromAddress(PP_NetAddress_Private* addr) {
if (!addr)
return PP_FALSE;
@@ -182,7 +182,7 @@ PP_Bool FlashUDPSocket::GetRecvFromAddress(PP_Flash_NetAddress* addr) {
int32_t FlashUDPSocket::SendTo(const char* buffer,
int32_t num_bytes,
- const PP_Flash_NetAddress* addr,
+ const PP_NetAddress_Private* addr,
PP_CompletionCallback callback) {
if (!buffer || num_bytes <= 0 || !addr || !callback.func)
return PP_ERROR_BADARGUMENT;
@@ -240,7 +240,7 @@ void FlashUDPSocket::OnBindCompleted(bool succeeded) {
void FlashUDPSocket::OnRecvFromCompleted(bool succeeded,
const std::string& data,
- const PP_Flash_NetAddress& addr) {
+ const PP_NetAddress_Private& addr) {
if (!recvfrom_callback_.func || !read_buffer_) {
NOTREACHED();
return;
@@ -343,7 +343,7 @@ void PPB_Flash_UDPSocket_Proxy::OnMsgRecvFromACK(
uint32 socket_id,
bool succeeded,
const std::string& data,
- const PP_Flash_NetAddress& addr) {
+ const PP_NetAddress_Private& addr) {
if (!g_id_to_socket) {
NOTREACHED();
return;
@@ -371,4 +371,3 @@ void PPB_Flash_UDPSocket_Proxy::OnMsgSendToACK(
} // namespace proxy
} // namespace ppapi
-
diff --git a/ppapi/proxy/ppb_flash_udp_socket_proxy.h b/ppapi/proxy/ppb_flash_udp_socket_proxy.h
index cea4dbf..ab5f84d 100644
--- a/ppapi/proxy/ppb_flash_udp_socket_proxy.h
+++ b/ppapi/proxy/ppb_flash_udp_socket_proxy.h
@@ -42,7 +42,7 @@ class PPB_Flash_UDPSocket_Proxy : public InterfaceProxy {
uint32 socket_id,
bool succeeded,
const std::string& data,
- const PP_Flash_NetAddress& addr);
+ const PP_NetAddress_Private& addr);
void OnMsgSendToACK(uint32 plugin_dispatcher_id,
uint32 socket_id,
bool succeeded,
generated by cgit v1.1 at 2025-03-02 22:28:56 +0000