Index: ppapi/proxy/ppapi_messages.h |
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h |
index 5e8978548f28ffc2195c18659c68fa9d11fdafaf..defb77966929d9b476c7b58e2853ca0c8c876293 100644 |
--- a/ppapi/proxy/ppapi_messages.h |
+++ b/ppapi/proxy/ppapi_messages.h |
@@ -23,6 +23,7 @@ |
#include "ppapi/c/dev/pp_video_dev.h" |
#include "ppapi/c/dev/ppb_text_input_dev.h" |
#include "ppapi/c/dev/ppb_truetype_font_dev.h" |
+#include "ppapi/c/dev/ppb_udp_socket_dev.h" |
#include "ppapi/c/dev/ppb_url_util_dev.h" |
#include "ppapi/c/dev/ppp_printing_dev.h" |
#include "ppapi/c/pp_bool.h" |
@@ -101,6 +102,8 @@ IPC_ENUM_TRAITS(PP_TrueTypeFontStyle_Dev) |
IPC_ENUM_TRAITS(PP_TrueTypeFontWeight_Dev) |
IPC_ENUM_TRAITS(PP_TrueTypeFontWidth_Dev) |
IPC_ENUM_TRAITS(PP_TrueTypeFontCharset_Dev) |
+IPC_ENUM_TRAITS_MAX_VALUE(PP_UDPSocket_Option_Dev, |
+ PP_UDPSOCKET_OPTION_RECV_BUFFER_SIZE) |
IPC_ENUM_TRAITS(PP_VideoDecodeError_Dev) |
IPC_ENUM_TRAITS(PP_VideoDecoder_Profile) |
@@ -1202,27 +1205,6 @@ IPC_MESSAGE_CONTROL3(PpapiHostMsg_PPBTCPSocket_SetBoolOption, |
uint32 /* name */, |
bool /* value */) |
-// UDPSocketPrivate. |
-IPC_MESSAGE_CONTROL0(PpapiHostMsg_UDPSocketPrivate_Create) |
-IPC_MESSAGE_CONTROL2(PpapiHostMsg_UDPSocketPrivate_SetBoolSocketFeature, |
- int32_t /* name */, |
- bool /* value */) |
-IPC_MESSAGE_CONTROL1(PpapiHostMsg_UDPSocketPrivate_Bind, |
- PP_NetAddress_Private /* net_addr */) |
-IPC_MESSAGE_CONTROL1(PpapiHostMsg_UDPSocketPrivate_RecvFrom, |
- int32_t /* num_bytes */) |
-IPC_MESSAGE_CONTROL2(PpapiHostMsg_UDPSocketPrivate_SendTo, |
- std::string /* data */, |
- PP_NetAddress_Private /* net_addr */) |
-IPC_MESSAGE_CONTROL0(PpapiHostMsg_UDPSocketPrivate_Close) |
-IPC_MESSAGE_CONTROL1(PpapiPluginMsg_UDPSocketPrivate_BindReply, |
- PP_NetAddress_Private /* bound_addr */) |
-IPC_MESSAGE_CONTROL2(PpapiPluginMsg_UDPSocketPrivate_RecvFromReply, |
- std::string /* data */, |
- PP_NetAddress_Private /* remote_addr */) |
-IPC_MESSAGE_CONTROL1(PpapiPluginMsg_UDPSocketPrivate_SendToReply, |
- int32_t /* bytes_written */) |
- |
// PPB_TCPServerSocket_Private. |
IPC_MESSAGE_CONTROL5(PpapiHostMsg_PPBTCPServerSocket_Listen, |
int32 /* routing_id */, |
@@ -1512,6 +1494,35 @@ IPC_MESSAGE_CONTROL0(PpapiHostMsg_Printing_GetDefaultPrintSettings) |
IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Printing_GetDefaultPrintSettingsReply, |
PP_PrintSettings_Dev /* print_settings */) |
+// UDP Socket ------------------------------------------------------------------ |
+// Creates a PPB_UDPSocket resource. |
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_UDPSocket_Create) |
+ |
+// Creates a PPB_UDPSocket_Private resource. |
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_UDPSocket_CreatePrivate) |
+ |
+// |list_value| constains only one element, which is the option value to set. |
+// base::Value cannot be used because it doesn't have a default constructor. |
+IPC_MESSAGE_CONTROL2(PpapiHostMsg_UDPSocket_SetOption, |
+ PP_UDPSocket_Option_Dev /* name */, |
+ base::ListValue /* list_value */) |
+IPC_MESSAGE_CONTROL1(PpapiHostMsg_UDPSocket_Bind, |
+ PP_NetAddress_Private /* net_addr */) |
+IPC_MESSAGE_CONTROL1(PpapiHostMsg_UDPSocket_RecvFrom, |
+ int32_t /* num_bytes */) |
+IPC_MESSAGE_CONTROL2(PpapiHostMsg_UDPSocket_SendTo, |
+ std::string /* data */, |
+ PP_NetAddress_Private /* net_addr */) |
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_UDPSocket_Close) |
+IPC_MESSAGE_CONTROL0(PpapiPluginMsg_UDPSocket_SetOptionReply) |
+IPC_MESSAGE_CONTROL1(PpapiPluginMsg_UDPSocket_BindReply, |
+ PP_NetAddress_Private /* bound_addr */) |
+IPC_MESSAGE_CONTROL2(PpapiPluginMsg_UDPSocket_RecvFromReply, |
+ std::string /* data */, |
+ PP_NetAddress_Private /* remote_addr */) |
+IPC_MESSAGE_CONTROL1(PpapiPluginMsg_UDPSocket_SendToReply, |
+ int32_t /* bytes_written */) |
+ |
// URLLoader ------------------------------------------------------------------ |
IPC_MESSAGE_CONTROL0(PpapiHostMsg_URLLoader_Create) |