diff options
| author | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-22 20:07:50 +0000 |
|---|---|---|
| committer | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-22 20:07:50 +0000 |
| commit | ee517558682427c2dc4c798f5e0f496fad47a7e2 (patch) | |
| tree | 0069113d04d8b9a0a0180b4ce4947d7a7c675e8d /ppapi | |
| parent | ad21b39d241a67477e1af670ec7d9a96741f609c (diff) | |
| download | chromium_src-ee517558682427c2dc4c798f5e0f496fad47a7e2.zip chromium_src-ee517558682427c2dc4c798f5e0f496fad47a7e2.tar.gz chromium_src-ee517558682427c2dc4c798f5e0f496fad47a7e2.tar.bz2 | |
Move PPB_NetAddress out of dev.
BUG=247225
TEST=None
Review URL: https://chromiumcodereview.appspot.com/17419008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
43 files changed, 457 insertions, 469 deletions
diff --git a/ppapi/api/dev/ppb_host_resolver_dev.idl b/ppapi/api/dev/ppb_host_resolver_dev.idl index fa5612b..df78110 100644 --- a/ppapi/api/dev/ppb_host_resolver_dev.idl +++ b/ppapi/api/dev/ppb_host_resolver_dev.idl @@ -35,7 +35,7 @@ struct PP_HostResolver_Hint_Dev { /** * Network address family. */ - PP_NetAddress_Family_Dev family; + PP_NetAddress_Family family; /** * Combination of flags from <code>PP_HostResolver_Flags_Dev</code>. */ @@ -133,9 +133,9 @@ interface PPB_HostResolver_Dev { * resolver. * @param[in] index An index indicating which address to return. * - * @return A <code>PPB_NetAddress_Dev</code> resource on success; 0 if there - * is a pending <code>Resolve()</code> call or the previous - * <code>Resolve()</code> call failed, or the specified index is out of range. + * @return A <code>PPB_NetAddress</code> resource on success; 0 if there is a + * pending <code>Resolve()</code> call or the previous <code>Resolve()</code> + * call failed, or the specified index is out of range. */ PP_Resource GetNetAddress([in] PP_Resource host_resolver, [in] uint32_t index); diff --git a/ppapi/api/dev/ppb_tcp_socket_dev.idl b/ppapi/api/dev/ppb_tcp_socket_dev.idl index c0b8d0d..3453de1 100644 --- a/ppapi/api/dev/ppb_tcp_socket_dev.idl +++ b/ppapi/api/dev/ppb_tcp_socket_dev.idl @@ -84,7 +84,7 @@ interface PPB_TCPSocket_Dev { * * @param[in] tcp_socket A <code>PP_Resource</code> corresponding to a TCP * socket. - * @param[in] addr A <code>PPB_NetAddress_Dev</code> resource. + * @param[in] addr A <code>PPB_NetAddress</code> resource. * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon * completion. * @@ -110,8 +110,7 @@ interface PPB_TCPSocket_Dev { * @param[in] tcp_socket A <code>PP_Resource</code> corresponding to a TCP * socket. * - * @return A <code>PPB_NetAddress_Dev</code> resource on success or 0 on - * failure. + * @return A <code>PPB_NetAddress</code> resource on success or 0 on failure. */ PP_Resource GetLocalAddress([in] PP_Resource tcp_socket); @@ -121,8 +120,7 @@ interface PPB_TCPSocket_Dev { * @param[in] tcp_socket A <code>PP_Resource</code> corresponding to a TCP * socket. * - * @return A <code>PPB_NetAddress_Dev</code> resource on success or 0 on - * failure. + * @return A <code>PPB_NetAddress</code> resource on success or 0 on failure. */ PP_Resource GetRemoteAddress([in] PP_Resource tcp_socket); diff --git a/ppapi/api/dev/ppb_udp_socket_dev.idl b/ppapi/api/dev/ppb_udp_socket_dev.idl index 95d02ac..193bec0 100644 --- a/ppapi/api/dev/ppb_udp_socket_dev.idl +++ b/ppapi/api/dev/ppb_udp_socket_dev.idl @@ -92,7 +92,7 @@ interface PPB_UDPSocket_Dev { * * @param[in] udp_socket A <code>PP_Resource</code> corresponding to a UDP * socket. - * @param[in] addr A <code>PPB_NetAddress_Dev</code> resource. + * @param[in] addr A <code>PPB_NetAddress</code> resource. * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon * completion. * @@ -111,8 +111,7 @@ interface PPB_UDPSocket_Dev { * @param[in] udp_socket A <code>PP_Resource</code> corresponding to a UDP * socket. * - * @return A <code>PPB_NetAddress_Dev</code> resource on success or 0 on - * failure. + * @return A <code>PPB_NetAddress</code> resource on success or 0 on failure. */ PP_Resource GetBoundAddress([in] PP_Resource udp_socket); @@ -125,8 +124,8 @@ interface PPB_UDPSocket_Dev { * @param[out] buffer The buffer to store the received data on success. It * must be at least as large as <code>num_bytes</code>. * @param[in] num_bytes The number of bytes to receive. - * @param[out] addr A <code>PPB_NetAddress_Dev</code> resource to store the - * source address on success. + * @param[out] addr A <code>PPB_NetAddress</code> resource to store the source + * address on success. * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon * completion. * @@ -146,7 +145,7 @@ interface PPB_UDPSocket_Dev { * socket. * @param[in] buffer The buffer containing the data to send. * @param[in] num_bytes The number of bytes to send. - * @param[in] addr A <code>PPB_NetAddress_Dev</code> resource holding the + * @param[in] addr A <code>PPB_NetAddress</code> resource holding the * destination address. * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon * completion. diff --git a/ppapi/api/dev/ppb_net_address_dev.idl b/ppapi/api/ppb_net_address.idl index cae7d29..ddd69b5 100644 --- a/ppapi/api/dev/ppb_net_address_dev.idl +++ b/ppapi/api/ppb_net_address.idl @@ -4,18 +4,18 @@ */ /** - * This file defines the <code>PPB_NetAddress_Dev</code> interface. + * This file defines the <code>PPB_NetAddress</code> interface. */ label Chrome { - M29 = 0.1 + M29 = 1.0 }; /** * Network address family types. */ [assert_size(4)] -enum PP_NetAddress_Family_Dev { +enum PP_NetAddress_Family { /** * The address family is unspecified. */ @@ -34,7 +34,7 @@ enum PP_NetAddress_Family_Dev { * All members are expressed in network byte order. */ [assert_size(6)] -struct PP_NetAddress_IPv4_Dev { +struct PP_NetAddress_IPv4 { /** * Port number. */ @@ -49,7 +49,7 @@ struct PP_NetAddress_IPv4_Dev { * All members are expressed in network byte order. */ [assert_size(18)] -struct PP_NetAddress_IPv6_Dev { +struct PP_NetAddress_IPv6 { /** * Port number. */ @@ -61,12 +61,12 @@ struct PP_NetAddress_IPv6_Dev { }; /** - * The <code>PPB_NetAddress_Dev</code> interface provides operations on - * network addresses. + * The <code>PPB_NetAddress</code> interface provides operations on network + * addresses. */ -interface PPB_NetAddress_Dev { +interface PPB_NetAddress { /** - * Creates a <code>PPB_NetAddress_Dev</code> resource with the specified IPv4 + * Creates a <code>PPB_NetAddress</code> resource with the specified IPv4 * address. * * @param[in] instance A <code>PP_Instance</code> identifying one instance of @@ -77,10 +77,10 @@ interface PPB_NetAddress_Dev { * <code>ipv4_addr</code> or 0 on failure. */ PP_Resource CreateFromIPv4Address([in] PP_Instance instance, - [in] PP_NetAddress_IPv4_Dev ipv4_addr); + [in] PP_NetAddress_IPv4 ipv4_addr); /** - * Creates a <code>PPB_NetAddress_Dev</code> resource with the specified IPv6 + * Creates a <code>PPB_NetAddress</code> resource with the specified IPv6 * address. * * @param[in] instance A <code>PP_Instance</code> identifying one instance of @@ -91,15 +91,15 @@ interface PPB_NetAddress_Dev { * <code>ipv6_addr</code> or 0 on failure. */ PP_Resource CreateFromIPv6Address([in] PP_Instance instance, - [in] PP_NetAddress_IPv6_Dev ipv6_addr); + [in] PP_NetAddress_IPv6 ipv6_addr); /** * Determines if a given resource is a network address. * * @param[in] resource A <code>PP_Resource</code> to check. * - * @return <code>PP_TRUE</code> if the input is a - * <code>PPB_NetAddress_Dev</code> resource; <code>PP_FALSE</code> otherwise. + * @return <code>PP_TRUE</code> if the input is a <code>PPB_NetAddress</code> + * resource; <code>PP_FALSE</code> otherwise. */ PP_Bool IsNetAddress([in] PP_Resource resource); @@ -112,7 +112,7 @@ interface PPB_NetAddress_Dev { * @return The address family on success; * <code>PP_NETADDRESS_FAMILY_UNSPECIFIED</code> on failure. */ - PP_NetAddress_Family_Dev GetFamily([in] PP_Resource addr); + PP_NetAddress_Family GetFamily([in] PP_Resource addr); /** * Returns a human-readable description of the network address. The @@ -132,38 +132,38 @@ interface PPB_NetAddress_Dev { [in] PP_Bool include_port); /** - * Fills a <code>PP_NetAddress_IPv4_Dev</code> structure if the network - * address is of <code>PP_NETADDRESS_FAMILY_IPV4</code> address family. + * Fills a <code>PP_NetAddress_IPv4</code> structure if the network address is + * of <code>PP_NETADDRESS_FAMILY_IPV4</code> address family. * Note that passing a network address of * <code>PP_NETADDRESS_FAMILY_IPV6</code> address family will fail even if the * address is an IPv4-mapped IPv6 address. * * @param[in] addr A <code>PP_Resource</code> corresponding to a network * address. - * @param[out] ipv4_addr A <code>PP_NetAddress_IPv4_Dev</code> structure to - * store the result. + * @param[out] ipv4_addr A <code>PP_NetAddress_IPv4</code> structure to store + * the result. * * @return A <code>PP_Bool</code> value indicating whether the operation * succeeded. */ PP_Bool DescribeAsIPv4Address([in] PP_Resource addr, - [out] PP_NetAddress_IPv4_Dev ipv4_addr); + [out] PP_NetAddress_IPv4 ipv4_addr); /** - * Fills a <code>PP_NetAddress_IPv6_Dev</code> structure if the network - * address is of <code>PP_NETADDRESS_FAMILY_IPV6</code> address family. + * Fills a <code>PP_NetAddress_IPv6</code> structure if the network address is + * of <code>PP_NETADDRESS_FAMILY_IPV6</code> address family. * Note that passing a network address of * <code>PP_NETADDRESS_FAMILY_IPV4</code> address family will fail - this * method doesn't map it to an IPv6 address. * * @param[in] addr A <code>PP_Resource</code> corresponding to a network * address. - * @param[out] ipv6_addr A <code>PP_NetAddress_IPv6_Dev</code> structure to - * store the result. + * @param[out] ipv6_addr A <code>PP_NetAddress_IPv6</code> structure to store + * the result. * * @return A <code>PP_Bool</code> value indicating whether the operation * succeeded. */ PP_Bool DescribeAsIPv6Address([in] PP_Resource addr, - [out] PP_NetAddress_IPv6_Dev ipv6_addr); + [out] PP_NetAddress_IPv6 ipv6_addr); }; diff --git a/ppapi/c/dev/ppb_host_resolver_dev.h b/ppapi/c/dev/ppb_host_resolver_dev.h index ea12eda..e06c10f 100644 --- a/ppapi/c/dev/ppb_host_resolver_dev.h +++ b/ppapi/c/dev/ppb_host_resolver_dev.h @@ -8,7 +8,6 @@ #ifndef PPAPI_C_DEV_PPB_HOST_RESOLVER_DEV_H_ #define PPAPI_C_DEV_PPB_HOST_RESOLVER_DEV_H_ -#include "ppapi/c/dev/ppb_net_address_dev.h" #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_instance.h" @@ -16,6 +15,7 @@ #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_stdint.h" #include "ppapi/c/pp_var.h" +#include "ppapi/c/ppb_net_address.h" #define PPB_HOSTRESOLVER_DEV_INTERFACE_0_1 "PPB_HostResolver(Dev);0.1" #define PPB_HOSTRESOLVER_DEV_INTERFACE PPB_HOSTRESOLVER_DEV_INTERFACE_0_1 @@ -58,7 +58,7 @@ struct PP_HostResolver_Hint_Dev { /** * Network address family. */ - PP_NetAddress_Family_Dev family; + PP_NetAddress_Family family; /** * Combination of flags from <code>PP_HostResolver_Flags_Dev</code>. */ @@ -159,9 +159,9 @@ struct PPB_HostResolver_Dev_0_1 { * resolver. * @param[in] index An index indicating which address to return. * - * @return A <code>PPB_NetAddress_Dev</code> resource on success; 0 if there - * is a pending <code>Resolve()</code> call or the previous - * <code>Resolve()</code> call failed, or the specified index is out of range. + * @return A <code>PPB_NetAddress</code> resource on success; 0 if there is a + * pending <code>Resolve()</code> call or the previous <code>Resolve()</code> + * call failed, or the specified index is out of range. */ PP_Resource (*GetNetAddress)(PP_Resource host_resolver, uint32_t index); }; diff --git a/ppapi/c/dev/ppb_tcp_socket_dev.h b/ppapi/c/dev/ppb_tcp_socket_dev.h index b5016c6..0859709 100644 --- a/ppapi/c/dev/ppb_tcp_socket_dev.h +++ b/ppapi/c/dev/ppb_tcp_socket_dev.h @@ -103,7 +103,7 @@ struct PPB_TCPSocket_Dev_0_1 { * * @param[in] tcp_socket A <code>PP_Resource</code> corresponding to a TCP * socket. - * @param[in] addr A <code>PPB_NetAddress_Dev</code> resource. + * @param[in] addr A <code>PPB_NetAddress</code> resource. * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon * completion. * @@ -128,8 +128,7 @@ struct PPB_TCPSocket_Dev_0_1 { * @param[in] tcp_socket A <code>PP_Resource</code> corresponding to a TCP * socket. * - * @return A <code>PPB_NetAddress_Dev</code> resource on success or 0 on - * failure. + * @return A <code>PPB_NetAddress</code> resource on success or 0 on failure. */ PP_Resource (*GetLocalAddress)(PP_Resource tcp_socket); /** @@ -138,8 +137,7 @@ struct PPB_TCPSocket_Dev_0_1 { * @param[in] tcp_socket A <code>PP_Resource</code> corresponding to a TCP * socket. * - * @return A <code>PPB_NetAddress_Dev</code> resource on success or 0 on - * failure. + * @return A <code>PPB_NetAddress</code> resource on success or 0 on failure. */ PP_Resource (*GetRemoteAddress)(PP_Resource tcp_socket); /** diff --git a/ppapi/c/dev/ppb_udp_socket_dev.h b/ppapi/c/dev/ppb_udp_socket_dev.h index 89436ad..53a8c4f 100644 --- a/ppapi/c/dev/ppb_udp_socket_dev.h +++ b/ppapi/c/dev/ppb_udp_socket_dev.h @@ -110,7 +110,7 @@ struct PPB_UDPSocket_Dev_0_1 { * * @param[in] udp_socket A <code>PP_Resource</code> corresponding to a UDP * socket. - * @param[in] addr A <code>PPB_NetAddress_Dev</code> resource. + * @param[in] addr A <code>PPB_NetAddress</code> resource. * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon * completion. * @@ -128,8 +128,7 @@ struct PPB_UDPSocket_Dev_0_1 { * @param[in] udp_socket A <code>PP_Resource</code> corresponding to a UDP * socket. * - * @return A <code>PPB_NetAddress_Dev</code> resource on success or 0 on - * failure. + * @return A <code>PPB_NetAddress</code> resource on success or 0 on failure. */ PP_Resource (*GetBoundAddress)(PP_Resource udp_socket); /** @@ -141,8 +140,8 @@ struct PPB_UDPSocket_Dev_0_1 { * @param[out] buffer The buffer to store the received data on success. It * must be at least as large as <code>num_bytes</code>. * @param[in] num_bytes The number of bytes to receive. - * @param[out] addr A <code>PPB_NetAddress_Dev</code> resource to store the - * source address on success. + * @param[out] addr A <code>PPB_NetAddress</code> resource to store the source + * address on success. * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon * completion. * @@ -161,7 +160,7 @@ struct PPB_UDPSocket_Dev_0_1 { * socket. * @param[in] buffer The buffer containing the data to send. * @param[in] num_bytes The number of bytes to send. - * @param[in] addr A <code>PPB_NetAddress_Dev</code> resource holding the + * @param[in] addr A <code>PPB_NetAddress</code> resource holding the * destination address. * @param[in] callback A <code>PP_CompletionCallback</code> to be called upon * completion. diff --git a/ppapi/c/dev/ppb_net_address_dev.h b/ppapi/c/ppb_net_address.h index 445679e..7f15183 100644 --- a/ppapi/c/dev/ppb_net_address_dev.h +++ b/ppapi/c/ppb_net_address.h @@ -3,10 +3,10 @@ * found in the LICENSE file. */ -/* From dev/ppb_net_address_dev.idl modified Thu Jun 20 12:10:09 2013. */ +/* From ppb_net_address.idl modified Sat Jun 22 10:14:31 2013. */ -#ifndef PPAPI_C_DEV_PPB_NET_ADDRESS_DEV_H_ -#define PPAPI_C_DEV_PPB_NET_ADDRESS_DEV_H_ +#ifndef PPAPI_C_PPB_NET_ADDRESS_H_ +#define PPAPI_C_PPB_NET_ADDRESS_H_ #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_instance.h" @@ -15,12 +15,12 @@ #include "ppapi/c/pp_stdint.h" #include "ppapi/c/pp_var.h" -#define PPB_NETADDRESS_DEV_INTERFACE_0_1 "PPB_NetAddress(Dev);0.1" -#define PPB_NETADDRESS_DEV_INTERFACE PPB_NETADDRESS_DEV_INTERFACE_0_1 +#define PPB_NETADDRESS_INTERFACE_1_0 "PPB_NetAddress;1.0" +#define PPB_NETADDRESS_INTERFACE PPB_NETADDRESS_INTERFACE_1_0 /** * @file - * This file defines the <code>PPB_NetAddress_Dev</code> interface. + * This file defines the <code>PPB_NetAddress</code> interface. */ @@ -44,8 +44,8 @@ typedef enum { * The Internet Protocol version 6 (IPv6) address family. */ PP_NETADDRESS_FAMILY_IPV6 = 2 -} PP_NetAddress_Family_Dev; -PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_NetAddress_Family_Dev, 4); +} PP_NetAddress_Family; +PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_NetAddress_Family, 4); /** * @} */ @@ -57,7 +57,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_NetAddress_Family_Dev, 4); /** * All members are expressed in network byte order. */ -struct PP_NetAddress_IPv4_Dev { +struct PP_NetAddress_IPv4 { /** * Port number. */ @@ -67,12 +67,12 @@ struct PP_NetAddress_IPv4_Dev { */ uint8_t addr[4]; }; -PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_NetAddress_IPv4_Dev, 6); +PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_NetAddress_IPv4, 6); /** * All members are expressed in network byte order. */ -struct PP_NetAddress_IPv6_Dev { +struct PP_NetAddress_IPv6 { /** * Port number. */ @@ -82,7 +82,7 @@ struct PP_NetAddress_IPv6_Dev { */ uint8_t addr[16]; }; -PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_NetAddress_IPv6_Dev, 18); +PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_NetAddress_IPv6, 18); /** * @} */ @@ -92,12 +92,12 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_NetAddress_IPv6_Dev, 18); * @{ */ /** - * The <code>PPB_NetAddress_Dev</code> interface provides operations on - * network addresses. + * The <code>PPB_NetAddress</code> interface provides operations on network + * addresses. */ -struct PPB_NetAddress_Dev_0_1 { +struct PPB_NetAddress_1_0 { /** - * Creates a <code>PPB_NetAddress_Dev</code> resource with the specified IPv4 + * Creates a <code>PPB_NetAddress</code> resource with the specified IPv4 * address. * * @param[in] instance A <code>PP_Instance</code> identifying one instance of @@ -109,9 +109,9 @@ struct PPB_NetAddress_Dev_0_1 { */ PP_Resource (*CreateFromIPv4Address)( PP_Instance instance, - const struct PP_NetAddress_IPv4_Dev* ipv4_addr); + const struct PP_NetAddress_IPv4* ipv4_addr); /** - * Creates a <code>PPB_NetAddress_Dev</code> resource with the specified IPv6 + * Creates a <code>PPB_NetAddress</code> resource with the specified IPv6 * address. * * @param[in] instance A <code>PP_Instance</code> identifying one instance of @@ -123,14 +123,14 @@ struct PPB_NetAddress_Dev_0_1 { */ PP_Resource (*CreateFromIPv6Address)( PP_Instance instance, - const struct PP_NetAddress_IPv6_Dev* ipv6_addr); + const struct PP_NetAddress_IPv6* ipv6_addr); /** * Determines if a given resource is a network address. * * @param[in] resource A <code>PP_Resource</code> to check. * - * @return <code>PP_TRUE</code> if the input is a - * <code>PPB_NetAddress_Dev</code> resource; <code>PP_FALSE</code> otherwise. + * @return <code>PP_TRUE</code> if the input is a <code>PPB_NetAddress</code> + * resource; <code>PP_FALSE</code> otherwise. */ PP_Bool (*IsNetAddress)(PP_Resource resource); /** @@ -142,7 +142,7 @@ struct PPB_NetAddress_Dev_0_1 { * @return The address family on success; * <code>PP_NETADDRESS_FAMILY_UNSPECIFIED</code> on failure. */ - PP_NetAddress_Family_Dev (*GetFamily)(PP_Resource addr); + PP_NetAddress_Family (*GetFamily)(PP_Resource addr); /** * Returns a human-readable description of the network address. The * description is in the form of host [ ":" port ] and conforms to @@ -159,45 +159,45 @@ struct PPB_NetAddress_Dev_0_1 { */ struct PP_Var (*DescribeAsString)(PP_Resource addr, PP_Bool include_port); /** - * Fills a <code>PP_NetAddress_IPv4_Dev</code> structure if the network - * address is of <code>PP_NETADDRESS_FAMILY_IPV4</code> address family. + * Fills a <code>PP_NetAddress_IPv4</code> structure if the network address is + * of <code>PP_NETADDRESS_FAMILY_IPV4</code> address family. * Note that passing a network address of * <code>PP_NETADDRESS_FAMILY_IPV6</code> address family will fail even if the * address is an IPv4-mapped IPv6 address. * * @param[in] addr A <code>PP_Resource</code> corresponding to a network * address. - * @param[out] ipv4_addr A <code>PP_NetAddress_IPv4_Dev</code> structure to - * store the result. + * @param[out] ipv4_addr A <code>PP_NetAddress_IPv4</code> structure to store + * the result. * * @return A <code>PP_Bool</code> value indicating whether the operation * succeeded. */ PP_Bool (*DescribeAsIPv4Address)(PP_Resource addr, - struct PP_NetAddress_IPv4_Dev* ipv4_addr); + struct PP_NetAddress_IPv4* ipv4_addr); /** - * Fills a <code>PP_NetAddress_IPv6_Dev</code> structure if the network - * address is of <code>PP_NETADDRESS_FAMILY_IPV6</code> address family. + * Fills a <code>PP_NetAddress_IPv6</code> structure if the network address is + * of <code>PP_NETADDRESS_FAMILY_IPV6</code> address family. * Note that passing a network address of * <code>PP_NETADDRESS_FAMILY_IPV4</code> address family will fail - this * method doesn't map it to an IPv6 address. * * @param[in] addr A <code>PP_Resource</code> corresponding to a network * address. - * @param[out] ipv6_addr A <code>PP_NetAddress_IPv6_Dev</code> structure to - * store the result. + * @param[out] ipv6_addr A <code>PP_NetAddress_IPv6</code> structure to store + * the result. * * @return A <code>PP_Bool</code> value indicating whether the operation * succeeded. */ PP_Bool (*DescribeAsIPv6Address)(PP_Resource addr, - struct PP_NetAddress_IPv6_Dev* ipv6_addr); + struct PP_NetAddress_IPv6* ipv6_addr); }; -typedef struct PPB_NetAddress_Dev_0_1 PPB_NetAddress_Dev; +typedef struct PPB_NetAddress_1_0 PPB_NetAddress; /** * @} */ -#endif /* PPAPI_C_DEV_PPB_NET_ADDRESS_DEV_H_ */ +#endif /* PPAPI_C_PPB_NET_ADDRESS_H_ */ diff --git a/ppapi/cpp/dev/host_resolver_dev.cc b/ppapi/cpp/dev/host_resolver_dev.cc index d5229a1..7075bb0 100644 --- a/ppapi/cpp/dev/host_resolver_dev.cc +++ b/ppapi/cpp/dev/host_resolver_dev.cc @@ -81,15 +81,15 @@ uint32_t HostResolver_Dev::GetNetAddressCount() const { return 0; } -NetAddress_Dev HostResolver_Dev::GetNetAddress(uint32_t index) const { +NetAddress HostResolver_Dev::GetNetAddress(uint32_t index) const { if (has_interface<PPB_HostResolver_Dev_0_1>()) { - return NetAddress_Dev( + return NetAddress( PASS_REF, get_interface<PPB_HostResolver_Dev_0_1>()->GetNetAddress( pp_resource(), index)); } - return NetAddress_Dev(); + return NetAddress(); } } // namespace pp diff --git a/ppapi/cpp/dev/host_resolver_dev.h b/ppapi/cpp/dev/host_resolver_dev.h index a746306..b0c9327 100644 --- a/ppapi/cpp/dev/host_resolver_dev.h +++ b/ppapi/cpp/dev/host_resolver_dev.h @@ -7,7 +7,7 @@ #include "ppapi/c/pp_stdint.h" #include "ppapi/c/dev/ppb_host_resolver_dev.h" -#include "ppapi/cpp/dev/net_address_dev.h" +#include "ppapi/cpp/net_address.h" #include "ppapi/cpp/pass_ref.h" #include "ppapi/cpp/resource.h" #include "ppapi/cpp/var.h" @@ -103,11 +103,11 @@ class HostResolver_Dev : public Resource { /// /// @param[in] index An index indicating which address to return. /// - /// @return A <code>NetAddress_Dev</code> object. The object will be null + /// @return A <code>NetAddress</code> object. The object will be null /// (i.e., is_null() returns true) if there is a pending /// <code>Resolve()</code> call or the previous <code>Resolve()</code> call /// failed, or the specified index is out of range. - NetAddress_Dev GetNetAddress(uint32_t index) const; + NetAddress GetNetAddress(uint32_t index) const; }; } // namespace pp diff --git a/ppapi/cpp/dev/net_address_dev.cc b/ppapi/cpp/dev/net_address_dev.cc deleted file mode 100644 index ec09caaa..0000000 --- a/ppapi/cpp/dev/net_address_dev.cc +++ /dev/null @@ -1,101 +0,0 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "ppapi/cpp/dev/net_address_dev.h" - -#include "ppapi/c/pp_bool.h" -#include "ppapi/cpp/instance_handle.h" -#include "ppapi/cpp/module_impl.h" - -namespace pp { - -namespace { - -template <> const char* interface_name<PPB_NetAddress_Dev_0_1>() { - return PPB_NETADDRESS_DEV_INTERFACE_0_1; -} - -} // namespace - -NetAddress_Dev::NetAddress_Dev() { -} - -NetAddress_Dev::NetAddress_Dev(PassRef, PP_Resource resource) - : Resource(PASS_REF, resource) { -} - -NetAddress_Dev::NetAddress_Dev(const InstanceHandle& instance, - const PP_NetAddress_IPv4_Dev& ipv4_addr) { - if (has_interface<PPB_NetAddress_Dev_0_1>()) { - PassRefFromConstructor( - get_interface<PPB_NetAddress_Dev_0_1>()->CreateFromIPv4Address( - instance.pp_instance(), &ipv4_addr)); - } -} - -NetAddress_Dev::NetAddress_Dev(const InstanceHandle& instance, - const PP_NetAddress_IPv6_Dev& ipv6_addr) { - if (has_interface<PPB_NetAddress_Dev_0_1>()) { - PassRefFromConstructor( - get_interface<PPB_NetAddress_Dev_0_1>()->CreateFromIPv6Address( - instance.pp_instance(), &ipv6_addr)); - } -} - -NetAddress_Dev::NetAddress_Dev(const NetAddress_Dev& other) : Resource(other) { -} - -NetAddress_Dev::~NetAddress_Dev() { -} - -NetAddress_Dev& NetAddress_Dev::operator=(const NetAddress_Dev& other) { - Resource::operator=(other); - return *this; -} - -// static -bool NetAddress_Dev::IsAvailable() { - return has_interface<PPB_NetAddress_Dev_0_1>(); -} - -PP_NetAddress_Family_Dev NetAddress_Dev::GetFamily() const { - if (has_interface<PPB_NetAddress_Dev_0_1>()) - return get_interface<PPB_NetAddress_Dev_0_1>()->GetFamily(pp_resource()); - - return PP_NETADDRESS_FAMILY_UNSPECIFIED; -} - -Var NetAddress_Dev::DescribeAsString(bool include_port) const { - if (has_interface<PPB_NetAddress_Dev_0_1>()) { - return Var(PASS_REF, - get_interface<PPB_NetAddress_Dev_0_1>()->DescribeAsString( - pp_resource(), PP_FromBool(include_port))); - } - - return Var(); -} - -bool NetAddress_Dev::DescribeAsIPv4Address( - PP_NetAddress_IPv4_Dev* ipv4_addr) const { - if (has_interface<PPB_NetAddress_Dev_0_1>()) { - return PP_ToBool( - get_interface<PPB_NetAddress_Dev_0_1>()->DescribeAsIPv4Address( - pp_resource(), ipv4_addr)); - } - - return false; -} - -bool NetAddress_Dev::DescribeAsIPv6Address( - PP_NetAddress_IPv6_Dev* ipv6_addr) const { - if (has_interface<PPB_NetAddress_Dev_0_1>()) { - return PP_ToBool( - get_interface<PPB_NetAddress_Dev_0_1>()->DescribeAsIPv6Address( - pp_resource(), ipv6_addr)); - } - - return false; -} - -} // namespace pp diff --git a/ppapi/cpp/dev/tcp_socket_dev.cc b/ppapi/cpp/dev/tcp_socket_dev.cc index 4ff9514..03628a8 100644 --- a/ppapi/cpp/dev/tcp_socket_dev.cc +++ b/ppapi/cpp/dev/tcp_socket_dev.cc @@ -49,7 +49,7 @@ bool TCPSocket_Dev::IsAvailable() { return has_interface<PPB_TCPSocket_Dev_0_1>(); } -int32_t TCPSocket_Dev::Connect(const NetAddress_Dev& addr, +int32_t TCPSocket_Dev::Connect(const NetAddress& addr, const CompletionCallback& callback) { if (has_interface<PPB_TCPSocket_Dev_0_1>()) { return get_interface<PPB_TCPSocket_Dev_0_1>()->Connect( @@ -58,23 +58,23 @@ int32_t TCPSocket_Dev::Connect(const NetAddress_Dev& addr, return callback.MayForce(PP_ERROR_NOINTERFACE); } -NetAddress_Dev TCPSocket_Dev::GetLocalAddress() const { +NetAddress TCPSocket_Dev::GetLocalAddress() const { if (has_interface<PPB_TCPSocket_Dev_0_1>()) { - return NetAddress_Dev( + return NetAddress( PASS_REF, get_interface<PPB_TCPSocket_Dev_0_1>()->GetLocalAddress(pp_resource())); } - return NetAddress_Dev(); + return NetAddress(); } -NetAddress_Dev TCPSocket_Dev::GetRemoteAddress() const { +NetAddress TCPSocket_Dev::GetRemoteAddress() const { if (has_interface<PPB_TCPSocket_Dev_0_1>()) { - return NetAddress_Dev( + return NetAddress( PASS_REF, get_interface<PPB_TCPSocket_Dev_0_1>()->GetRemoteAddress( pp_resource())); } - return NetAddress_Dev(); + return NetAddress(); } int32_t TCPSocket_Dev::Read(char* buffer, diff --git a/ppapi/cpp/dev/tcp_socket_dev.h b/ppapi/cpp/dev/tcp_socket_dev.h index 0fc1cd2..4067bf0 100644 --- a/ppapi/cpp/dev/tcp_socket_dev.h +++ b/ppapi/cpp/dev/tcp_socket_dev.h @@ -6,7 +6,7 @@ #define PPAPI_CPP_DEV_TCP_SOCKET_DEV_H_ #include "ppapi/c/dev/ppb_tcp_socket_dev.h" -#include "ppapi/cpp/dev/net_address_dev.h" +#include "ppapi/cpp/net_address.h" #include "ppapi/cpp/pass_ref.h" #include "ppapi/cpp/resource.h" @@ -62,7 +62,7 @@ class TCPSocket_Dev: public Resource { /// Connects the socket to the given address. /// - /// @param[in] addr A <code>NetAddress_Dev</code> object. + /// @param[in] addr A <code>NetAddress</code> object. /// @param[in] callback A <code>CompletionCallback</code> to be called upon /// completion. /// @@ -77,20 +77,20 @@ class TCPSocket_Dev: public Resource { /// - <code>PP_ERROR_CONNECTION_FAILED</code>: the connection attempt failed. /// - <code>PP_ERROR_CONNECTION_TIMEDOUT</code>: the connection attempt timed /// out. - int32_t Connect(const NetAddress_Dev& addr, + int32_t Connect(const NetAddress& addr, const CompletionCallback& callback); /// Gets the local address of the socket, if it is connected. /// - /// @return A <code>NetAddress_Dev</code> object. The object will be null + /// @return A <code>NetAddress</code> object. The object will be null /// (i.e., is_null() returns true) on failure. - NetAddress_Dev GetLocalAddress() const; + NetAddress GetLocalAddress() const; /// Gets the remote address of the socket, if it is connected. /// - /// @return A <code>NetAddress_Dev</code> object. The object will be null + /// @return A <code>NetAddress</code> object. The object will be null /// (i.e., is_null() returns true) on failure. - NetAddress_Dev GetRemoteAddress() const; + NetAddress GetRemoteAddress() const; /// Reads data from the socket. The socket must be connected. It may perform a /// partial read. @@ -163,4 +163,4 @@ class TCPSocket_Dev: public Resource { } // namespace pp -#endif // PPAPI_CPP_DEV_TCP_SOCKET_DEV_H_ +#endif // PPAPI_CPP_DEV_TCP_SOCKET__DevDEV_H_ diff --git a/ppapi/cpp/dev/udp_socket_dev.cc b/ppapi/cpp/dev/udp_socket_dev.cc index dd8ffd0..cc3d4b9 100644 --- a/ppapi/cpp/dev/udp_socket_dev.cc +++ b/ppapi/cpp/dev/udp_socket_dev.cc @@ -50,7 +50,7 @@ bool UDPSocket_Dev::IsAvailable() { return has_interface<PPB_UDPSocket_Dev_0_1>(); } -int32_t UDPSocket_Dev::Bind(const NetAddress_Dev& addr, +int32_t UDPSocket_Dev::Bind(const NetAddress& addr, const CompletionCallback& callback) { if (has_interface<PPB_UDPSocket_Dev_0_1>()) { return get_interface<PPB_UDPSocket_Dev_0_1>()->Bind( @@ -59,19 +59,19 @@ int32_t UDPSocket_Dev::Bind(const NetAddress_Dev& addr, return callback.MayForce(PP_ERROR_NOINTERFACE); } -NetAddress_Dev UDPSocket_Dev::GetBoundAddress() { +NetAddress UDPSocket_Dev::GetBoundAddress() { if (has_interface<PPB_UDPSocket_Dev_0_1>()) { - return NetAddress_Dev( + return NetAddress( PASS_REF, get_interface<PPB_UDPSocket_Dev_0_1>()->GetBoundAddress(pp_resource())); } - return NetAddress_Dev(); + return NetAddress(); } int32_t UDPSocket_Dev::RecvFrom( char* buffer, int32_t num_bytes, - const CompletionCallbackWithOutput<NetAddress_Dev>& callback) { + const CompletionCallbackWithOutput<NetAddress>& callback) { if (has_interface<PPB_UDPSocket_Dev_0_1>()) { return get_interface<PPB_UDPSocket_Dev_0_1>()->RecvFrom( pp_resource(), buffer, num_bytes, callback.output(), @@ -82,7 +82,7 @@ int32_t UDPSocket_Dev::RecvFrom( int32_t UDPSocket_Dev::SendTo(const char* buffer, int32_t num_bytes, - const NetAddress_Dev& addr, + const NetAddress& addr, const CompletionCallback& callback) { if (has_interface<PPB_UDPSocket_Dev_0_1>()) { return get_interface<PPB_UDPSocket_Dev_0_1>()->SendTo( diff --git a/ppapi/cpp/dev/udp_socket_dev.h b/ppapi/cpp/dev/udp_socket_dev.h index 85f5cb2..5a63ac9 100644 --- a/ppapi/cpp/dev/udp_socket_dev.h +++ b/ppapi/cpp/dev/udp_socket_dev.h @@ -6,7 +6,7 @@ #define PPAPI_CPP_DEV_UDP_SOCKET_DEV_H_ #include "ppapi/c/dev/ppb_udp_socket_dev.h" -#include "ppapi/cpp/dev/net_address_dev.h" +#include "ppapi/cpp/net_address.h" #include "ppapi/cpp/pass_ref.h" #include "ppapi/cpp/resource.h" @@ -66,7 +66,7 @@ class UDPSocket_Dev: public Resource { /// Binds the socket to the given address. /// - /// @param[in] addr A <code>NetAddress_Dev</code> object. + /// @param[in] addr A <code>NetAddress</code> object. /// @param[in] callback A <code>CompletionCallback</code> to be called upon /// completion. /// @@ -74,14 +74,14 @@ class UDPSocket_Dev: public Resource { /// <code>PP_ERROR_NOACCESS</code> will be returned if the caller doesn't have /// required permissions. <code>PP_ERROR_ADDRESS_IN_USE</code> will be /// returned if the address is already in use. - int32_t Bind(const NetAddress_Dev& addr, + int32_t Bind(const NetAddress& addr, const CompletionCallback& callback); /// Get the address that the socket is bound to. The socket must be bound. /// - /// @return A <code>NetAddress_Dev</code> object. The object will be null + /// @return A <code>NetAddress</code> object. The object will be null /// (i.e., is_null() returns true) on failure. - NetAddress_Dev GetBoundAddress(); + NetAddress GetBoundAddress(); /// Receives data from the socket and stores the source address. The socket /// must be bound. @@ -110,14 +110,14 @@ class UDPSocket_Dev: public Resource { int32_t RecvFrom( char* buffer, int32_t num_bytes, - const CompletionCallbackWithOutput<NetAddress_Dev>& callback); + const CompletionCallbackWithOutput<NetAddress>& callback); /// Sends data to a specific destination. The socket must be bound. /// /// @param[in] buffer The buffer containing the data to send. /// @param[in] num_bytes The number of bytes to send. - /// @param[in] addr A <code>NetAddress_Dev</code> object holding the - /// destination address. + /// @param[in] addr A <code>NetAddress</code> object holding the destination + /// address. /// @param[in] callback A <code>CompletionCallback</code> to be called upon /// completion. /// @@ -127,7 +127,7 @@ class UDPSocket_Dev: public Resource { /// required permissions. int32_t SendTo(const char* buffer, int32_t num_bytes, - const NetAddress_Dev& addr, + const NetAddress& addr, const CompletionCallback& callback); /// Cancels all pending reads and writes, and closes the socket. Any pending diff --git a/ppapi/cpp/net_address.cc b/ppapi/cpp/net_address.cc new file mode 100644 index 0000000..e96b03d --- /dev/null +++ b/ppapi/cpp/net_address.cc @@ -0,0 +1,99 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "ppapi/cpp/net_address.h" + +#include "ppapi/c/pp_bool.h" +#include "ppapi/cpp/instance_handle.h" +#include "ppapi/cpp/module_impl.h" + +namespace pp { + +namespace { + +template <> const char* interface_name<PPB_NetAddress_1_0>() { + return PPB_NETADDRESS_INTERFACE_1_0; +} + +} // namespace + +NetAddress::NetAddress() { +} + +NetAddress::NetAddress(PassRef, PP_Resource resource) + : Resource(PASS_REF, resource) { +} + +NetAddress::NetAddress(const InstanceHandle& instance, + const PP_NetAddress_IPv4& ipv4_addr) { + if (has_interface<PPB_NetAddress_1_0>()) { + PassRefFromConstructor( + get_interface<PPB_NetAddress_1_0>()->CreateFromIPv4Address( + instance.pp_instance(), &ipv4_addr)); + } +} + +NetAddress::NetAddress(const InstanceHandle& instance, + const PP_NetAddress_IPv6& ipv6_addr) { + if (has_interface<PPB_NetAddress_1_0>()) { + PassRefFromConstructor( + get_interface<PPB_NetAddress_1_0>()->CreateFromIPv6Address( + instance.pp_instance(), &ipv6_addr)); + } +} + +NetAddress::NetAddress(const NetAddress& other) : Resource(other) { +} + +NetAddress::~NetAddress() { +} + +NetAddress& NetAddress::operator=(const NetAddress& other) { + Resource::operator=(other); + return *this; +} + +// static +bool NetAddress::IsAvailable() { + return has_interface<PPB_NetAddress_1_0>(); +} + +PP_NetAddress_Family NetAddress::GetFamily() const { + if (has_interface<PPB_NetAddress_1_0>()) + return get_interface<PPB_NetAddress_1_0>()->GetFamily(pp_resource()); + + return PP_NETADDRESS_FAMILY_UNSPECIFIED; +} + +Var NetAddress::DescribeAsString(bool include_port) const { + if (has_interface<PPB_NetAddress_1_0>()) { + return Var(PASS_REF, + get_interface<PPB_NetAddress_1_0>()->DescribeAsString( + pp_resource(), PP_FromBool(include_port))); + } + + return Var(); +} + +bool NetAddress::DescribeAsIPv4Address(PP_NetAddress_IPv4* ipv4_addr) const { + if (has_interface<PPB_NetAddress_1_0>()) { + return PP_ToBool( + get_interface<PPB_NetAddress_1_0>()->DescribeAsIPv4Address( + pp_resource(), ipv4_addr)); + } + + return false; +} + +bool NetAddress::DescribeAsIPv6Address(PP_NetAddress_IPv6* ipv6_addr) const { + if (has_interface<PPB_NetAddress_1_0>()) { + return PP_ToBool( + get_interface<PPB_NetAddress_1_0>()->DescribeAsIPv6Address( + pp_resource(), ipv6_addr)); + } + + return false; +} + +} // namespace pp diff --git a/ppapi/cpp/dev/net_address_dev.h b/ppapi/cpp/net_address.h index 4090aa3..9f101f2 100644 --- a/ppapi/cpp/dev/net_address_dev.h +++ b/ppapi/cpp/net_address.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef PPAPI_CPP_DEV_NET_ADDRESS_DEV_H_ -#define PPAPI_CPP_DEV_NET_ADDRESS_DEV_H_ +#ifndef PPAPI_CPP_NET_ADDRESS_H_ +#define PPAPI_CPP_NET_ADDRESS_H_ -#include "ppapi/c/dev/ppb_net_address_dev.h" +#include "ppapi/c/ppb_net_address.h" #include "ppapi/cpp/pass_ref.h" #include "ppapi/cpp/resource.h" #include "ppapi/cpp/var.h" @@ -14,54 +14,54 @@ namespace pp { class InstanceHandle; -/// The <code>NetAddress_Dev</code> class represents a network address. -class NetAddress_Dev : public Resource { +/// The <code>NetAddress</code> class represents a network address. +class NetAddress : public Resource { public: - /// Default constructor for creating an is_null() <code>NetAddress_Dev</code> + /// Default constructor for creating an is_null() <code>NetAddress</code> /// object. - NetAddress_Dev(); + NetAddress(); /// A constructor used when you have received a <code>PP_Resource</code> as a /// return value that has had 1 ref added for you. /// - /// @param[in] resource A <code>PPB_NetAddress_Dev</code> resource. - NetAddress_Dev(PassRef, PP_Resource resource); + /// @param[in] resource A <code>PPB_NetAddress</code> resource. + NetAddress(PassRef, PP_Resource resource); - /// A constructor used to create a <code>NetAddress_Dev</code> object with the + /// A constructor used to create a <code>NetAddress</code> object with the /// specified IPv4 address. /// /// @param[in] instance The instance with which this resource will be /// associated. /// @param[in] ipv4_addr An IPv4 address. - NetAddress_Dev(const InstanceHandle& instance, - const PP_NetAddress_IPv4_Dev& ipv4_addr); + NetAddress(const InstanceHandle& instance, + const PP_NetAddress_IPv4& ipv4_addr); - /// A constructor used to create a <code>NetAddress_Dev</code> object with the + /// A constructor used to create a <code>NetAddress</code> object with the /// specified IPv6 address. /// /// @param[in] instance The instance with which this resource will be /// associated. /// @param[in] ipv6_addr An IPv6 address. - NetAddress_Dev(const InstanceHandle& instance, - const PP_NetAddress_IPv6_Dev& ipv6_addr); + NetAddress(const InstanceHandle& instance, + const PP_NetAddress_IPv6& ipv6_addr); - /// The copy constructor for <code>NetAddress_Dev</code>. + /// The copy constructor for <code>NetAddress</code>. /// - /// @param[in] other A reference to another <code>NetAddress_Dev</code>. - NetAddress_Dev(const NetAddress_Dev& other); + /// @param[in] other A reference to another <code>NetAddress</code>. + NetAddress(const NetAddress& other); /// The destructor. - virtual ~NetAddress_Dev(); + virtual ~NetAddress(); - /// The assignment operator for <code>NetAddress_Dev</code>. + /// The assignment operator for <code>NetAddress</code>. /// - /// @param[in] other A reference to another <code>NetAddress_Dev</code>. + /// @param[in] other A reference to another <code>NetAddress</code>. /// - /// @return A reference to this <code>NetAddress_Dev</code> object. - NetAddress_Dev& operator=(const NetAddress_Dev& other); + /// @return A reference to this <code>NetAddress</code> object. + NetAddress& operator=(const NetAddress& other); /// Static function for determining whether the browser supports the - /// <code>PPB_NetAddress_Dev</code> interface. + /// <code>PPB_NetAddress</code> interface. /// /// @return true if the interface is available, false otherwise. static bool IsAvailable(); @@ -70,7 +70,7 @@ class NetAddress_Dev : public Resource { /// /// @return The address family on success; /// <code>PP_NETADDRESS_FAMILY_UNSPECIFIED</code> on failure. - PP_NetAddress_Family_Dev GetFamily() const; + PP_NetAddress_Family GetFamily() const; /// Returns a human-readable description of the network address. The /// description is in the form of host [ ":" port ] and conforms to @@ -84,31 +84,31 @@ class NetAddress_Dev : public Resource { /// <code>Var</code> on failure. Var DescribeAsString(bool include_port) const; - /// Fills a <code>PP_NetAddress_IPv4_Dev</code> structure if the network - /// address is of <code>PP_NETADDRESS_FAMILY_IPV4</code> address family. + /// Fills a <code>PP_NetAddress_IPv4</code> structure if the network address + /// is of <code>PP_NETADDRESS_FAMILY_IPV4</code> address family. /// Note that passing a network address of /// <code>PP_NETADDRESS_FAMILY_IPV6</code> address family will fail even if /// the address is an IPv4-mapped IPv6 address. /// - /// @param[out] ipv4_addr A <code>PP_NetAddress_IPv4_Dev</code> structure to - /// store the result. + /// @param[out] ipv4_addr A <code>PP_NetAddress_IPv4</code> structure to store + /// the result. /// /// @return A boolean value indicating whether the operation succeeded. - bool DescribeAsIPv4Address(PP_NetAddress_IPv4_Dev* ipv4_addr) const; + bool DescribeAsIPv4Address(PP_NetAddress_IPv4* ipv4_addr) const; - /// Fills a <code>PP_NetAddress_IPv6_Dev</code> structure if the network - /// address is of <code>PP_NETADDRESS_FAMILY_IPV6</code> address family. + /// Fills a <code>PP_NetAddress_IPv6</code> structure if the network address + /// is of <code>PP_NETADDRESS_FAMILY_IPV6</code> address family. /// Note that passing a network address of /// <code>PP_NETADDRESS_FAMILY_IPV4</code> address family will fail - this /// method doesn't map it to an IPv6 address. /// - /// @param[out] ipv6_addr A <code>PP_NetAddress_IPv6_Dev</code> structure to - /// store the result. + /// @param[out] ipv6_addr A <code>PP_NetAddress_IPv6</code> structure to store + /// the result. /// /// @return A boolean value indicating whether the operation succeeded. - bool DescribeAsIPv6Address(PP_NetAddress_IPv6_Dev* ipv6_addr) const; + bool DescribeAsIPv6Address(PP_NetAddress_IPv6* ipv6_addr) const; }; } // namespace pp -#endif // PPAPI_CPP_DEV_NET_ADDRESS_DEV_H_ +#endif // PPAPI_CPP_NET_ADDRESS_H_ diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c index 5443916..7e4d65b 100644 --- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c +++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c @@ -20,7 +20,6 @@ #include "ppapi/c/dev/ppb_ime_input_event_dev.h" #include "ppapi/c/dev/ppb_keyboard_input_event_dev.h" #include "ppapi/c/dev/ppb_memory_dev.h" -#include "ppapi/c/dev/ppb_net_address_dev.h" #include "ppapi/c/dev/ppb_printing_dev.h" #include "ppapi/c/dev/ppb_resource_array_dev.h" #include "ppapi/c/dev/ppb_scrollbar_dev.h" @@ -66,6 +65,7 @@ #include "ppapi/c/ppb_messaging.h" #include "ppapi/c/ppb_mouse_cursor.h" #include "ppapi/c/ppb_mouse_lock.h" +#include "ppapi/c/ppb_net_address.h" #include "ppapi/c/ppb_url_loader.h" #include "ppapi/c/ppb_url_request_info.h" #include "ppapi/c/ppb_url_response_info.h" @@ -150,6 +150,7 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TouchInputEvent_1_0; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MessageLoop_1_0; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Messaging_1_0; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MouseLock_1_0; +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_NetAddress_1_0; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_URLLoader_1_0; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_URLRequestInfo_1_0; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_URLResponseInfo_1_0; @@ -169,7 +170,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Font_Dev_0_6; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_HostResolver_Dev_0_1; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_IMEInputEvent_Dev_0_1; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_IMEInputEvent_Dev_0_2; -static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_NetAddress_Dev_0_1; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Printing_Dev_0_7; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TCPSocket_Dev_0_1; static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Testing_Dev_0_9; @@ -889,6 +889,45 @@ static void Pnacl_M16_PPB_MouseLock_UnlockMouse(PP_Instance instance) { /* End wrapper methods for PPB_MouseLock_1_0 */ +/* Begin wrapper methods for PPB_NetAddress_1_0 */ + +static PP_Resource Pnacl_M29_PPB_NetAddress_CreateFromIPv4Address(PP_Instance instance, const struct PP_NetAddress_IPv4* ipv4_addr) { + const struct PPB_NetAddress_1_0 *iface = Pnacl_WrapperInfo_PPB_NetAddress_1_0.real_iface; + return iface->CreateFromIPv4Address(instance, ipv4_addr); +} + +static PP_Resource Pnacl_M29_PPB_NetAddress_CreateFromIPv6Address(PP_Instance instance, const struct PP_NetAddress_IPv6* ipv6_addr) { + const struct PPB_NetAddress_1_0 *iface = Pnacl_WrapperInfo_PPB_NetAddress_1_0.real_iface; + return iface->CreateFromIPv6Address(instance, ipv6_addr); +} + +static PP_Bool Pnacl_M29_PPB_NetAddress_IsNetAddress(PP_Resource resource) { + const struct PPB_NetAddress_1_0 *iface = Pnacl_WrapperInfo_PPB_NetAddress_1_0.real_iface; + return iface->IsNetAddress(resource); +} + +static PP_NetAddress_Family Pnacl_M29_PPB_NetAddress_GetFamily(PP_Resource addr) { + const struct PPB_NetAddress_1_0 *iface = Pnacl_WrapperInfo_PPB_NetAddress_1_0.real_iface; + return iface->GetFamily(addr); +} + +static void Pnacl_M29_PPB_NetAddress_DescribeAsString(struct PP_Var* _struct_result, PP_Resource addr, PP_Bool include_port) { + const struct PPB_NetAddress_1_0 *iface = Pnacl_WrapperInfo_PPB_NetAddress_1_0.real_iface; + *_struct_result = iface->DescribeAsString(addr, include_port); +} + +static PP_Bool Pnacl_M29_PPB_NetAddress_DescribeAsIPv4Address(PP_Resource addr, struct PP_NetAddress_IPv4* ipv4_addr) { + const struct PPB_NetAddress_1_0 *iface = Pnacl_WrapperInfo_PPB_NetAddress_1_0.real_iface; + return iface->DescribeAsIPv4Address(addr, ipv4_addr); +} + +static PP_Bool Pnacl_M29_PPB_NetAddress_DescribeAsIPv6Address(PP_Resource addr, struct PP_NetAddress_IPv6* ipv6_addr) { + const struct PPB_NetAddress_1_0 *iface = Pnacl_WrapperInfo_PPB_NetAddress_1_0.real_iface; + return iface->DescribeAsIPv6Address(addr, ipv6_addr); +} + +/* End wrapper methods for PPB_NetAddress_1_0 */ + /* Begin wrapper methods for PPB_URLLoader_1_0 */ static PP_Resource Pnacl_M14_PPB_URLLoader_Create(PP_Instance instance) { @@ -1561,45 +1600,6 @@ static void Pnacl_M21_PPB_IMEInputEvent_Dev_GetSelection(PP_Resource ime_event, /* Not generating wrapper methods for PPB_Memory_Dev_0_1 */ -/* Begin wrapper methods for PPB_NetAddress_Dev_0_1 */ - -static PP_Resource Pnacl_M29_PPB_NetAddress_Dev_CreateFromIPv4Address(PP_Instance instance, const struct PP_NetAddress_IPv4_Dev* ipv4_addr) { - const struct PPB_NetAddress_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_NetAddress_Dev_0_1.real_iface; - return iface->CreateFromIPv4Address(instance, ipv4_addr); -} - -static PP_Resource Pnacl_M29_PPB_NetAddress_Dev_CreateFromIPv6Address(PP_Instance instance, const struct PP_NetAddress_IPv6_Dev* ipv6_addr) { - const struct PPB_NetAddress_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_NetAddress_Dev_0_1.real_iface; - return iface->CreateFromIPv6Address(instance, ipv6_addr); -} - -static PP_Bool Pnacl_M29_PPB_NetAddress_Dev_IsNetAddress(PP_Resource resource) { - const struct PPB_NetAddress_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_NetAddress_Dev_0_1.real_iface; - return iface->IsNetAddress(resource); -} - -static PP_NetAddress_Family_Dev Pnacl_M29_PPB_NetAddress_Dev_GetFamily(PP_Resource addr) { - const struct PPB_NetAddress_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_NetAddress_Dev_0_1.real_iface; - return iface->GetFamily(addr); -} - -static void Pnacl_M29_PPB_NetAddress_Dev_DescribeAsString(struct PP_Var* _struct_result, PP_Resource addr, PP_Bool include_port) { - const struct PPB_NetAddress_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_NetAddress_Dev_0_1.real_iface; - *_struct_result = iface->DescribeAsString(addr, include_port); -} - -static PP_Bool Pnacl_M29_PPB_NetAddress_Dev_DescribeAsIPv4Address(PP_Resource addr, struct PP_NetAddress_IPv4_Dev* ipv4_addr) { - const struct PPB_NetAddress_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_NetAddress_Dev_0_1.real_iface; - return iface->DescribeAsIPv4Address(addr, ipv4_addr); -} - -static PP_Bool Pnacl_M29_PPB_NetAddress_Dev_DescribeAsIPv6Address(PP_Resource addr, struct PP_NetAddress_IPv6_Dev* ipv6_addr) { - const struct PPB_NetAddress_Dev_0_1 *iface = Pnacl_WrapperInfo_PPB_NetAddress_Dev_0_1.real_iface; - return iface->DescribeAsIPv6Address(addr, ipv6_addr); -} - -/* End wrapper methods for PPB_NetAddress_Dev_0_1 */ - /* Begin wrapper methods for PPB_Printing_Dev_0_7 */ static PP_Resource Pnacl_M23_PPB_Printing_Dev_Create(PP_Instance instance) { @@ -3945,6 +3945,16 @@ struct PPB_MouseLock_1_0 Pnacl_Wrappers_PPB_MouseLock_1_0 = { .UnlockMouse = (void (*)(PP_Instance instance))&Pnacl_M16_PPB_MouseLock_UnlockMouse }; +struct PPB_NetAddress_1_0 Pnacl_Wrappers_PPB_NetAddress_1_0 = { + .CreateFromIPv4Address = (PP_Resource (*)(PP_Instance instance, const struct PP_NetAddress_IPv4* ipv4_addr))&Pnacl_M29_PPB_NetAddress_CreateFromIPv4Address, + .CreateFromIPv6Address = (PP_Resource (*)(PP_Instance instance, const struct PP_NetAddress_IPv6* ipv6_addr))&Pnacl_M29_PPB_NetAddress_CreateFromIPv6Address, + .IsNetAddress = (PP_Bool (*)(PP_Resource resource))&Pnacl_M29_PPB_NetAddress_IsNetAddress, + .GetFamily = (PP_NetAddress_Family (*)(PP_Resource addr))&Pnacl_M29_PPB_NetAddress_GetFamily, + .DescribeAsString = (struct PP_Var (*)(PP_Resource addr, PP_Bool include_port))&Pnacl_M29_PPB_NetAddress_DescribeAsString, + .DescribeAsIPv4Address = (PP_Bool (*)(PP_Resource addr, struct PP_NetAddress_IPv4* ipv4_addr))&Pnacl_M29_PPB_NetAddress_DescribeAsIPv4Address, + .DescribeAsIPv6Address = (PP_Bool (*)(PP_Resource addr, struct PP_NetAddress_IPv6* ipv6_addr))&Pnacl_M29_PPB_NetAddress_DescribeAsIPv6Address +}; + struct PPB_URLLoader_1_0 Pnacl_Wrappers_PPB_URLLoader_1_0 = { .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M14_PPB_URLLoader_Create, .IsURLLoader = (PP_Bool (*)(PP_Resource resource))&Pnacl_M14_PPB_URLLoader_IsURLLoader, @@ -4156,16 +4166,6 @@ struct PPB_IMEInputEvent_Dev_0_2 Pnacl_Wrappers_PPB_IMEInputEvent_Dev_0_2 = { /* Not generating wrapper interface for PPB_Memory_Dev_0_1 */ -struct PPB_NetAddress_Dev_0_1 Pnacl_Wrappers_PPB_NetAddress_Dev_0_1 = { - .CreateFromIPv4Address = (PP_Resource (*)(PP_Instance instance, const struct PP_NetAddress_IPv4_Dev* ipv4_addr))&Pnacl_M29_PPB_NetAddress_Dev_CreateFromIPv4Address, - .CreateFromIPv6Address = (PP_Resource (*)(PP_Instance instance, const struct PP_NetAddress_IPv6_Dev* ipv6_addr))&Pnacl_M29_PPB_NetAddress_Dev_CreateFromIPv6Address, - .IsNetAddress = (PP_Bool (*)(PP_Resource resource))&Pnacl_M29_PPB_NetAddress_Dev_IsNetAddress, - .GetFamily = (PP_NetAddress_Family_Dev (*)(PP_Resource addr))&Pnacl_M29_PPB_NetAddress_Dev_GetFamily, - .DescribeAsString = (struct PP_Var (*)(PP_Resource addr, PP_Bool include_port))&Pnacl_M29_PPB_NetAddress_Dev_DescribeAsString, - .DescribeAsIPv4Address = (PP_Bool (*)(PP_Resource addr, struct PP_NetAddress_IPv4_Dev* ipv4_addr))&Pnacl_M29_PPB_NetAddress_Dev_DescribeAsIPv4Address, - .DescribeAsIPv6Address = (PP_Bool (*)(PP_Resource addr, struct PP_NetAddress_IPv6_Dev* ipv6_addr))&Pnacl_M29_PPB_NetAddress_Dev_DescribeAsIPv6Address -}; - struct PPB_Printing_Dev_0_7 Pnacl_Wrappers_PPB_Printing_Dev_0_7 = { .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M23_PPB_Printing_Dev_Create, .GetDefaultPrintSettings = (int32_t (*)(PP_Resource resource, struct PP_PrintSettings_Dev* print_settings, struct PP_CompletionCallback callback))&Pnacl_M23_PPB_Printing_Dev_GetDefaultPrintSettings @@ -4866,6 +4866,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_MouseLock_1_0 = { .real_iface = NULL }; +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_NetAddress_1_0 = { + .iface_macro = PPB_NETADDRESS_INTERFACE_1_0, + .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_NetAddress_1_0, + .real_iface = NULL +}; + static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_URLLoader_1_0 = { .iface_macro = PPB_URLLOADER_INTERFACE_1_0, .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_URLLoader_1_0, @@ -4980,12 +4986,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_IMEInputEvent_Dev_0_2 = { .real_iface = NULL }; -static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_NetAddress_Dev_0_1 = { - .iface_macro = PPB_NETADDRESS_DEV_INTERFACE_0_1, - .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_NetAddress_Dev_0_1, - .real_iface = NULL -}; - static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Printing_Dev_0_7 = { .iface_macro = PPB_PRINTING_DEV_INTERFACE_0_7, .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_Printing_Dev_0_7, @@ -5317,6 +5317,7 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = { &Pnacl_WrapperInfo_PPB_MessageLoop_1_0, &Pnacl_WrapperInfo_PPB_Messaging_1_0, &Pnacl_WrapperInfo_PPB_MouseLock_1_0, + &Pnacl_WrapperInfo_PPB_NetAddress_1_0, &Pnacl_WrapperInfo_PPB_URLLoader_1_0, &Pnacl_WrapperInfo_PPB_URLRequestInfo_1_0, &Pnacl_WrapperInfo_PPB_URLResponseInfo_1_0, @@ -5335,7 +5336,6 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = { &Pnacl_WrapperInfo_PPB_HostResolver_Dev_0_1, &Pnacl_WrapperInfo_PPB_IMEInputEvent_Dev_0_1, &Pnacl_WrapperInfo_PPB_IMEInputEvent_Dev_0_2, - &Pnacl_WrapperInfo_PPB_NetAddress_Dev_0_1, &Pnacl_WrapperInfo_PPB_Printing_Dev_0_7, &Pnacl_WrapperInfo_PPB_TCPSocket_Dev_0_1, &Pnacl_WrapperInfo_PPB_Testing_Dev_0_9, diff --git a/ppapi/ppapi_shared.gypi b/ppapi/ppapi_shared.gypi index 217c2a28..a8eda9b 100644 --- a/ppapi/ppapi_shared.gypi +++ b/ppapi/ppapi_shared.gypi @@ -211,7 +211,7 @@ 'thunk/ppb_mouse_cursor_thunk.cc', 'thunk/ppb_mouse_lock_thunk.cc', 'thunk/ppb_net_address_api.h', - 'thunk/ppb_net_address_dev_thunk.cc', + 'thunk/ppb_net_address_thunk.cc', 'thunk/ppb_network_list_api.h', 'thunk/ppb_network_list_private_thunk.cc', 'thunk/ppb_network_monitor_private_api.h', diff --git a/ppapi/ppapi_sources.gypi b/ppapi/ppapi_sources.gypi index 06ff1c4..ad188bc 100644 --- a/ppapi/ppapi_sources.gypi +++ b/ppapi/ppapi_sources.gypi @@ -41,6 +41,7 @@ 'c/ppb_messaging.h', 'c/ppb_mouse_cursor.h', 'c/ppb_mouse_lock.h', + 'c/ppb_net_address.h', 'c/ppb_opengles2.h', 'c/pp_touch_point.h', 'c/ppb_url_loader.h', @@ -72,7 +73,6 @@ 'c/dev/ppb_host_resolver_dev.h', 'c/dev/ppb_ime_input_event_dev.h', 'c/dev/ppb_memory_dev.h', - 'c/dev/ppb_net_address_dev.h', 'c/dev/ppb_printing_dev.h', 'c/dev/ppb_resource_array_dev.h', 'c/dev/ppb_scrollbar_dev.h', @@ -187,6 +187,8 @@ 'cpp/mouse_cursor.h', 'cpp/mouse_lock.cc', 'cpp/mouse_lock.h', + 'cpp/net_address.cc', + 'cpp/net_address.h', 'cpp/output_traits.h', 'cpp/point.h', 'cpp/rect.cc', @@ -239,8 +241,6 @@ 'cpp/dev/ime_input_event_dev.h', 'cpp/dev/memory_dev.cc', 'cpp/dev/memory_dev.h', - 'cpp/dev/net_address_dev.cc', - 'cpp/dev/net_address_dev.h', 'cpp/dev/printing_dev.cc', 'cpp/dev/printing_dev.h', 'cpp/dev/resource_array_dev.cc', diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc index e88a6e3..87a7359 100644 --- a/ppapi/proxy/interface_list.cc +++ b/ppapi/proxy/interface_list.cc @@ -19,7 +19,6 @@ #include "ppapi/c/dev/ppb_ime_input_event_dev.h" #include "ppapi/c/dev/ppb_keyboard_input_event_dev.h" #include "ppapi/c/dev/ppb_memory_dev.h" -#include "ppapi/c/dev/ppb_net_address_dev.h" #include "ppapi/c/dev/ppb_opengles2ext_dev.h" #include "ppapi/c/dev/ppb_printing_dev.h" #include "ppapi/c/dev/ppb_resource_array_dev.h" @@ -50,6 +49,7 @@ #include "ppapi/c/ppb_message_loop.h" #include "ppapi/c/ppb_messaging.h" #include "ppapi/c/ppb_mouse_lock.h" +#include "ppapi/c/ppb_net_address.h" #include "ppapi/c/ppb_opengles2.h" #include "ppapi/c/ppb_url_loader.h" #include "ppapi/c/ppb_url_request_info.h" diff --git a/ppapi/proxy/net_address_resource.cc b/ppapi/proxy/net_address_resource.cc index 8bda8dd..9d906a5 100644 --- a/ppapi/proxy/net_address_resource.cc +++ b/ppapi/proxy/net_address_resource.cc @@ -16,7 +16,7 @@ namespace proxy { NetAddressResource::NetAddressResource( Connection connection, PP_Instance instance, - const PP_NetAddress_IPv4_Dev& ipv4_addr) + const PP_NetAddress_IPv4& ipv4_addr) : PluginResource(connection, instance) { NetAddressPrivateImpl::CreateNetAddressPrivateFromIPv4Address(ipv4_addr, &address_); @@ -25,7 +25,7 @@ NetAddressResource::NetAddressResource( NetAddressResource::NetAddressResource( Connection connection, PP_Instance instance, - const PP_NetAddress_IPv6_Dev& ipv6_addr) + const PP_NetAddress_IPv6& ipv6_addr) : PluginResource(connection, instance) { NetAddressPrivateImpl::CreateNetAddressPrivateFromIPv6Address(ipv6_addr, &address_); @@ -46,7 +46,7 @@ thunk::PPB_NetAddress_API* NetAddressResource::AsPPB_NetAddress_API() { return this; } -PP_NetAddress_Family_Dev NetAddressResource::GetFamily() { +PP_NetAddress_Family NetAddressResource::GetFamily() { return NetAddressPrivateImpl::GetFamilyFromNetAddressPrivate(address_); } @@ -60,14 +60,14 @@ PP_Var NetAddressResource::DescribeAsString(PP_Bool include_port) { } PP_Bool NetAddressResource::DescribeAsIPv4Address( - PP_NetAddress_IPv4_Dev* ipv4_addr) { + PP_NetAddress_IPv4* ipv4_addr) { return PP_FromBool( NetAddressPrivateImpl::DescribeNetAddressPrivateAsIPv4Address( address_, ipv4_addr)); } PP_Bool NetAddressResource::DescribeAsIPv6Address( - PP_NetAddress_IPv6_Dev* ipv6_addr) { + PP_NetAddress_IPv6* ipv6_addr) { return PP_FromBool( NetAddressPrivateImpl::DescribeNetAddressPrivateAsIPv6Address( address_, ipv6_addr)); diff --git a/ppapi/proxy/net_address_resource.h b/ppapi/proxy/net_address_resource.h index 9c50492..4d23604 100644 --- a/ppapi/proxy/net_address_resource.h +++ b/ppapi/proxy/net_address_resource.h @@ -20,10 +20,10 @@ class PPAPI_PROXY_EXPORT NetAddressResource : public PluginResource, public: NetAddressResource(Connection connection, PP_Instance instance, - const PP_NetAddress_IPv4_Dev& ipv4_addr); + const PP_NetAddress_IPv4& ipv4_addr); NetAddressResource(Connection connection, PP_Instance instance, - const PP_NetAddress_IPv6_Dev& ipv6_addr); + const PP_NetAddress_IPv6& ipv6_addr); NetAddressResource(Connection connection, PP_Instance instance, const PP_NetAddress_Private& private_addr); @@ -34,16 +34,16 @@ class PPAPI_PROXY_EXPORT NetAddressResource : public PluginResource, virtual thunk::PPB_NetAddress_API* AsPPB_NetAddress_API() OVERRIDE; // PPB_NetAddress_API implementation. - virtual PP_NetAddress_Family_Dev GetFamily() OVERRIDE; + virtual PP_NetAddress_Family GetFamily() OVERRIDE; virtual PP_Var DescribeAsString(PP_Bool include_port) OVERRIDE; virtual PP_Bool DescribeAsIPv4Address( - PP_NetAddress_IPv4_Dev* ipv4_addr) OVERRIDE; + PP_NetAddress_IPv4* ipv4_addr) OVERRIDE; virtual PP_Bool DescribeAsIPv6Address( - PP_NetAddress_IPv6_Dev* ipv6_addr) OVERRIDE; + PP_NetAddress_IPv6* ipv6_addr) OVERRIDE; virtual const PP_NetAddress_Private& GetNetAddressPrivate() OVERRIDE; private: - // TODO(yzshen): Refactor the code so that PPB_NetAddress_Dev resource doesn't + // TODO(yzshen): Refactor the code so that PPB_NetAddress resource doesn't // use PP_NetAddress_Private as storage type. PP_NetAddress_Private address_; diff --git a/ppapi/proxy/resource_creation_proxy.cc b/ppapi/proxy/resource_creation_proxy.cc index 1ec2853..337d620 100644 --- a/ppapi/proxy/resource_creation_proxy.cc +++ b/ppapi/proxy/resource_creation_proxy.cc @@ -292,14 +292,14 @@ PP_Resource ResourceCreationProxy::CreateImageDataSimple( PP_Resource ResourceCreationProxy::CreateNetAddressFromIPv4Address( PP_Instance instance, - const PP_NetAddress_IPv4_Dev* ipv4_addr) { + const PP_NetAddress_IPv4* ipv4_addr) { return (new NetAddressResource(GetConnection(), instance, *ipv4_addr))->GetReference(); } PP_Resource ResourceCreationProxy::CreateNetAddressFromIPv6Address( PP_Instance instance, - const PP_NetAddress_IPv6_Dev* ipv6_addr) { + const PP_NetAddress_IPv6* ipv6_addr) { return (new NetAddressResource(GetConnection(), instance, *ipv6_addr))->GetReference(); } diff --git a/ppapi/proxy/resource_creation_proxy.h b/ppapi/proxy/resource_creation_proxy.h index d62f747..47b40a8 100644 --- a/ppapi/proxy/resource_creation_proxy.h +++ b/ppapi/proxy/resource_creation_proxy.h @@ -128,10 +128,10 @@ class ResourceCreationProxy : public InterfaceProxy, PP_Bool init_to_zero) OVERRIDE; virtual PP_Resource CreateNetAddressFromIPv4Address( PP_Instance instance, - const PP_NetAddress_IPv4_Dev* ipv4_addr) OVERRIDE; + const PP_NetAddress_IPv4* ipv4_addr) OVERRIDE; virtual PP_Resource CreateNetAddressFromIPv6Address( PP_Instance instance, - const PP_NetAddress_IPv6_Dev* ipv6_addr) OVERRIDE; + const PP_NetAddress_IPv6* ipv6_addr) OVERRIDE; virtual PP_Resource CreateNetAddressFromNetAddressPrivate( PP_Instance instance, const PP_NetAddress_Private& private_addr) OVERRIDE; diff --git a/ppapi/shared_impl/private/net_address_private_impl.cc b/ppapi/shared_impl/private/net_address_private_impl.cc index b8ca434..35231d5 100644 --- a/ppapi/shared_impl/private/net_address_private_impl.cc +++ b/ppapi/shared_impl/private/net_address_private_impl.cc @@ -519,7 +519,7 @@ std::string NetAddressPrivateImpl::DescribeNetAddress( // static void NetAddressPrivateImpl::CreateNetAddressPrivateFromIPv4Address( - const PP_NetAddress_IPv4_Dev& ipv4_addr, + const PP_NetAddress_IPv4& ipv4_addr, PP_NetAddress_Private* addr) { CreateFromIPv4Address(ipv4_addr.addr, ConvertFromNetEndian16(ipv4_addr.port), addr); @@ -527,14 +527,14 @@ void NetAddressPrivateImpl::CreateNetAddressPrivateFromIPv4Address( // static void NetAddressPrivateImpl::CreateNetAddressPrivateFromIPv6Address( - const PP_NetAddress_IPv6_Dev& ipv6_addr, + const PP_NetAddress_IPv6& ipv6_addr, PP_NetAddress_Private* addr) { CreateFromIPv6Address(ipv6_addr.addr, 0, ConvertFromNetEndian16(ipv6_addr.port), addr); } // static -PP_NetAddress_Family_Dev NetAddressPrivateImpl::GetFamilyFromNetAddressPrivate( +PP_NetAddress_Family NetAddressPrivateImpl::GetFamilyFromNetAddressPrivate( const PP_NetAddress_Private& addr) { const NetAddress* net_addr = ToNetAddress(&addr); if (!IsValid(net_addr)) @@ -546,7 +546,7 @@ PP_NetAddress_Family_Dev NetAddressPrivateImpl::GetFamilyFromNetAddressPrivate( // static bool NetAddressPrivateImpl::DescribeNetAddressPrivateAsIPv4Address( const PP_NetAddress_Private& addr, - PP_NetAddress_IPv4_Dev* ipv4_addr) { + PP_NetAddress_IPv4* ipv4_addr) { if (!ipv4_addr) return false; @@ -566,7 +566,7 @@ bool NetAddressPrivateImpl::DescribeNetAddressPrivateAsIPv4Address( // static bool NetAddressPrivateImpl::DescribeNetAddressPrivateAsIPv6Address( const PP_NetAddress_Private& addr, - PP_NetAddress_IPv6_Dev* ipv6_addr) { + PP_NetAddress_IPv6* ipv6_addr) { if (!ipv6_addr) return false; diff --git a/ppapi/shared_impl/private/net_address_private_impl.h b/ppapi/shared_impl/private/net_address_private_impl.h index fdc9577..a8ba059 100644 --- a/ppapi/shared_impl/private/net_address_private_impl.h +++ b/ppapi/shared_impl/private/net_address_private_impl.h @@ -9,8 +9,8 @@ #include <vector> #include "base/basictypes.h" -#include "ppapi/c/dev/ppb_net_address_dev.h" #include "ppapi/c/pp_stdint.h" +#include "ppapi/c/ppb_net_address.h" #include "ppapi/shared_impl/ppapi_shared_export.h" struct PP_NetAddress_Private; @@ -37,24 +37,24 @@ class PPAPI_SHARED_EXPORT NetAddressPrivateImpl { static std::string DescribeNetAddress(const PP_NetAddress_Private& addr, bool include_port); - // Conversion methods to make PPB_NetAddress_Dev resource work with + // Conversion methods to make PPB_NetAddress resource work with // PP_NetAddress_Private. - // TODO(yzshen): Remove them once PPB_NetAddress_Dev resource doesn't use + // TODO(yzshen): Remove them once PPB_NetAddress resource doesn't use // PP_NetAddress_Private as storage type. static void CreateNetAddressPrivateFromIPv4Address( - const PP_NetAddress_IPv4_Dev& ipv4_addr, + const PP_NetAddress_IPv4& ipv4_addr, PP_NetAddress_Private* addr); static void CreateNetAddressPrivateFromIPv6Address( - const PP_NetAddress_IPv6_Dev& ipv6_addr, + const PP_NetAddress_IPv6& ipv6_addr, PP_NetAddress_Private* addr); - static PP_NetAddress_Family_Dev GetFamilyFromNetAddressPrivate( + static PP_NetAddress_Family GetFamilyFromNetAddressPrivate( const PP_NetAddress_Private& addr); static bool DescribeNetAddressPrivateAsIPv4Address( const PP_NetAddress_Private& addr, - PP_NetAddress_IPv4_Dev* ipv4_addr); + PP_NetAddress_IPv4* ipv4_addr); static bool DescribeNetAddressPrivateAsIPv6Address( const PP_NetAddress_Private& addr, - PP_NetAddress_IPv6_Dev* ipv6_addr); + PP_NetAddress_IPv6* ipv6_addr); static const PP_NetAddress_Private kInvalidNetAddress; diff --git a/ppapi/tests/all_c_includes.h b/ppapi/tests/all_c_includes.h index 95e0108..d11a8c9 100644 --- a/ppapi/tests/all_c_includes.h +++ b/ppapi/tests/all_c_includes.h @@ -23,7 +23,6 @@ #include "ppapi/c/dev/ppb_host_resolver_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_net_address_dev.h" #include "ppapi/c/dev/ppb_printing_dev.h" #include "ppapi/c/dev/ppb_resource_array_dev.h" #include "ppapi/c/dev/ppb_scrollbar_dev.h" @@ -85,6 +84,7 @@ #include "ppapi/c/ppb_instance.h" #include "ppapi/c/ppb_messaging.h" #include "ppapi/c/ppb_mouse_lock.h" +#include "ppapi/c/ppb_net_address.h" #include "ppapi/c/ppb_opengles2.h" #include "ppapi/c/ppb_url_loader.h" #include "ppapi/c/ppb_url_request_info.h" diff --git a/ppapi/tests/all_cpp_includes.h b/ppapi/tests/all_cpp_includes.h index 9f6bc7d..6edcc7f 100644 --- a/ppapi/tests/all_cpp_includes.h +++ b/ppapi/tests/all_cpp_includes.h @@ -21,7 +21,6 @@ #include "ppapi/cpp/dev/host_resolver_dev.h" #include "ppapi/cpp/dev/ime_input_event_dev.h" #include "ppapi/cpp/dev/memory_dev.h" -#include "ppapi/cpp/dev/net_address_dev.h" #include "ppapi/cpp/dev/printing_dev.h" #include "ppapi/cpp/dev/resource_array_dev.h" #include "ppapi/cpp/dev/scriptable_object_deprecated.h" @@ -52,6 +51,7 @@ #include "ppapi/cpp/module.h" #include "ppapi/cpp/module_impl.h" #include "ppapi/cpp/mouse_lock.h" +#include "ppapi/cpp/net_address.h" #include "ppapi/cpp/point.h" #include "ppapi/cpp/private/content_decryptor_private.h" #include "ppapi/cpp/private/flash_font_file.h" diff --git a/ppapi/tests/test_host_resolver.cc b/ppapi/tests/test_host_resolver.cc index 7be4700..8c97ce5 100644 --- a/ppapi/tests/test_host_resolver.cc +++ b/ppapi/tests/test_host_resolver.cc @@ -5,8 +5,8 @@ #include "ppapi/tests/test_host_resolver.h" #include "ppapi/cpp/dev/host_resolver_dev.h" -#include "ppapi/cpp/dev/net_address_dev.h" #include "ppapi/cpp/dev/tcp_socket_dev.h" +#include "ppapi/cpp/net_address.h" #include "ppapi/cpp/var.h" #include "ppapi/tests/test_utils.h" #include "ppapi/tests/testing_instance.h" @@ -46,7 +46,7 @@ void TestHostResolver::RunTests(const std::string& filter) { std::string TestHostResolver::SyncConnect( pp::TCPSocket_Dev* socket, - const pp::NetAddress_Dev& address) { + const pp::NetAddress& address) { TestCompletionCallback callback(instance_->pp_instance(), callback_type()); callback.WaitForResult(socket->Connect(address, callback.GetCallback())); CHECK_CALLBACK_BEHAVIOR(callback); @@ -119,7 +119,7 @@ std::string TestHostResolver::ParameterizedTestResolve( size_t size = host_resolver.GetNetAddressCount(); ASSERT_TRUE(size >= 1); - pp::NetAddress_Dev address; + pp::NetAddress address; for (size_t i = 0; i < size; ++i) { address = host_resolver.GetNetAddress(i); ASSERT_NE(0, address.pp_resource()); @@ -148,7 +148,7 @@ std::string TestHostResolver::ParameterizedTestResolve( std::string TestHostResolver::TestEmpty() { pp::HostResolver_Dev host_resolver(instance_); ASSERT_EQ(0, host_resolver.GetNetAddressCount()); - pp::NetAddress_Dev address = host_resolver.GetNetAddress(0); + pp::NetAddress address = host_resolver.GetNetAddress(0); ASSERT_EQ(0, address.pp_resource()); PASS(); diff --git a/ppapi/tests/test_host_resolver.h b/ppapi/tests/test_host_resolver.h index a67ed1f..4359c69 100644 --- a/ppapi/tests/test_host_resolver.h +++ b/ppapi/tests/test_host_resolver.h @@ -12,7 +12,7 @@ namespace pp { class HostResolver_Dev; -class NetAddress_Dev; +class NetAddress; class TCPSocket_Dev; } // namespace pp @@ -26,7 +26,7 @@ class TestHostResolver : public TestCase { private: std::string SyncConnect(pp::TCPSocket_Dev* socket, - const pp::NetAddress_Dev& address); + const pp::NetAddress& address); std::string SyncRead(pp::TCPSocket_Dev* socket, char* buffer, int32_t num_bytes, diff --git a/ppapi/tests/test_net_address.cc b/ppapi/tests/test_net_address.cc index b6dff7b..f719ba5 100644 --- a/ppapi/tests/test_net_address.cc +++ b/ppapi/tests/test_net_address.cc @@ -6,40 +6,40 @@ #include <cstring> -#include "ppapi/cpp/dev/net_address_dev.h" +#include "ppapi/cpp/net_address.h" #include "ppapi/tests/test_utils.h" #include "ppapi/tests/testing_instance.h" -using pp::NetAddress_Dev; +using pp::NetAddress; REGISTER_TEST_CASE(NetAddress); namespace { -bool EqualIPv4Address(const PP_NetAddress_IPv4_Dev& addr1, - const PP_NetAddress_IPv4_Dev& addr2) { +bool EqualIPv4Address(const PP_NetAddress_IPv4& addr1, + const PP_NetAddress_IPv4& addr2) { return addr1.port == addr2.port && !memcmp(addr1.addr, addr2.addr, sizeof(addr1.addr)); } -bool EqualIPv6Address(const PP_NetAddress_IPv6_Dev& addr1, - const PP_NetAddress_IPv6_Dev& addr2) { +bool EqualIPv6Address(const PP_NetAddress_IPv6& addr1, + const PP_NetAddress_IPv6& addr2) { return addr1.port == addr2.port && !memcmp(addr1.addr, addr2.addr, sizeof(addr1.addr)); } -NetAddress_Dev CreateFromHostOrderIPv6Address( +NetAddress CreateFromHostOrderIPv6Address( const pp::InstanceHandle& instance, const uint16_t host_order_addr[8], uint16_t host_order_port) { - PP_NetAddress_IPv6_Dev ipv6_addr; + PP_NetAddress_IPv6 ipv6_addr; ipv6_addr.port = ConvertToNetEndian16(host_order_port); for (size_t i = 0; i < 8; ++i) { uint16_t net_order_addr = ConvertToNetEndian16(host_order_addr[i]); memcpy(&ipv6_addr.addr[2 * i], &net_order_addr, 2); } - return NetAddress_Dev(instance, ipv6_addr); + return NetAddress(instance, ipv6_addr); } } // namespace @@ -48,7 +48,7 @@ TestNetAddress::TestNetAddress(TestingInstance* instance) : TestCase(instance) { } bool TestNetAddress::Init() { - return NetAddress_Dev::IsAvailable(); + return NetAddress::IsAvailable(); } void TestNetAddress::RunTests(const std::string& filter) { @@ -58,39 +58,38 @@ void TestNetAddress::RunTests(const std::string& filter) { } std::string TestNetAddress::TestIPv4Address() { - PP_NetAddress_IPv4_Dev ipv4_addr = { ConvertToNetEndian16(80), - { 127, 0, 0, 1 } }; - NetAddress_Dev net_addr(instance_, ipv4_addr); + PP_NetAddress_IPv4 ipv4_addr = { ConvertToNetEndian16(80), { 127, 0, 0, 1 } }; + NetAddress net_addr(instance_, ipv4_addr); ASSERT_NE(0, net_addr.pp_resource()); ASSERT_EQ(PP_NETADDRESS_FAMILY_IPV4, net_addr.GetFamily()); - PP_NetAddress_IPv4_Dev out_ipv4_addr; + PP_NetAddress_IPv4 out_ipv4_addr; ASSERT_TRUE(net_addr.DescribeAsIPv4Address(&out_ipv4_addr)); ASSERT_TRUE(EqualIPv4Address(ipv4_addr, out_ipv4_addr)); - PP_NetAddress_IPv6_Dev out_ipv6_addr; + PP_NetAddress_IPv6 out_ipv6_addr; ASSERT_FALSE(net_addr.DescribeAsIPv6Address(&out_ipv6_addr)); PASS(); } std::string TestNetAddress::TestIPv6Address() { - PP_NetAddress_IPv6_Dev ipv6_addr = { + PP_NetAddress_IPv6 ipv6_addr = { ConvertToNetEndian16(1024), { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 } }; - NetAddress_Dev net_addr(instance_, ipv6_addr); + NetAddress net_addr(instance_, ipv6_addr); ASSERT_NE(0, net_addr.pp_resource()); ASSERT_EQ(PP_NETADDRESS_FAMILY_IPV6, net_addr.GetFamily()); - PP_NetAddress_IPv6_Dev out_ipv6_addr; + PP_NetAddress_IPv6 out_ipv6_addr; ASSERT_TRUE(net_addr.DescribeAsIPv6Address(&out_ipv6_addr)); ASSERT_TRUE(EqualIPv6Address(ipv6_addr, out_ipv6_addr)); - PP_NetAddress_IPv4_Dev out_ipv4_addr; + PP_NetAddress_IPv4 out_ipv4_addr; ASSERT_FALSE(net_addr.DescribeAsIPv4Address(&out_ipv4_addr)); PASS(); @@ -99,15 +98,15 @@ std::string TestNetAddress::TestIPv6Address() { std::string TestNetAddress::TestDescribeAsString() { { // Test describing IPv4 addresses. - PP_NetAddress_IPv4_Dev ipv4_addr1 = { ConvertToNetEndian16(1234), - { 127, 0, 0, 1 } }; - NetAddress_Dev addr1(instance_, ipv4_addr1); + PP_NetAddress_IPv4 ipv4_addr1 = { ConvertToNetEndian16(1234), + { 127, 0, 0, 1 } }; + NetAddress addr1(instance_, ipv4_addr1); ASSERT_EQ("127.0.0.1", addr1.DescribeAsString(false).AsString()); ASSERT_EQ("127.0.0.1:1234", addr1.DescribeAsString(true).AsString()); - PP_NetAddress_IPv4_Dev ipv4_addr2 = { ConvertToNetEndian16(80), - { 192, 168, 0, 2 } }; - NetAddress_Dev addr2(instance_, ipv4_addr2); + PP_NetAddress_IPv4 ipv4_addr2 = { ConvertToNetEndian16(80), + { 192, 168, 0, 2 } }; + NetAddress addr2(instance_, ipv4_addr2); ASSERT_EQ("192.168.0.2", addr2.DescribeAsString(false).AsString()); ASSERT_EQ("192.168.0.2:80", addr2.DescribeAsString(true).AsString()); } @@ -160,7 +159,7 @@ std::string TestNetAddress::TestDescribeAsString() { for (size_t i = 0; i < sizeof(ipv6_test_cases) / sizeof(ipv6_test_cases[0]); ++i) { - NetAddress_Dev addr = CreateFromHostOrderIPv6Address( + NetAddress addr = CreateFromHostOrderIPv6Address( instance_, ipv6_test_cases[i].host_order_addr, ipv6_test_cases[i].host_order_port); ASSERT_EQ(ipv6_test_cases[i].expected_without_port, diff --git a/ppapi/tests/test_tcp_socket.cc b/ppapi/tests/test_tcp_socket.cc index d177a31..699eff9 100644 --- a/ppapi/tests/test_tcp_socket.cc +++ b/ppapi/tests/test_tcp_socket.cc @@ -59,7 +59,7 @@ std::string TestTCPSocket::TestConnect() { CHECK_CALLBACK_BEHAVIOR(cb); ASSERT_EQ(PP_OK, cb.result()); - pp::NetAddress_Dev local_addr, remote_addr; + pp::NetAddress local_addr, remote_addr; local_addr = socket.GetLocalAddress(); remote_addr = socket.GetRemoteAddress(); diff --git a/ppapi/tests/test_tcp_socket.h b/ppapi/tests/test_tcp_socket.h index 0ff7e33..3f8ba86 100644 --- a/ppapi/tests/test_tcp_socket.h +++ b/ppapi/tests/test_tcp_socket.h @@ -8,7 +8,7 @@ #include <string> #include "ppapi/c/pp_stdint.h" -#include "ppapi/cpp/dev/net_address_dev.h" +#include "ppapi/cpp/net_address.h" #include "ppapi/tests/test_case.h" namespace pp { @@ -31,7 +31,7 @@ class TestTCPSocket: public TestCase { int32_t ReadFirstLineFromSocket(pp::TCPSocket_Dev* socket, std::string* s); int32_t WriteStringToSocket(pp::TCPSocket_Dev* socket, const std::string& s); - pp::NetAddress_Dev addr_; + pp::NetAddress addr_; }; #endif // PAPPI_TESTS_TEST_TCP_SOCKET_H_ diff --git a/ppapi/tests/test_udp_socket.cc b/ppapi/tests/test_udp_socket.cc index 3141201..f558443 100644 --- a/ppapi/tests/test_udp_socket.cc +++ b/ppapi/tests/test_udp_socket.cc @@ -20,29 +20,29 @@ namespace { const uint16_t kPortScanFrom = 1024; const uint16_t kPortScanTo = 4096; -pp::NetAddress_Dev ReplacePort(const pp::InstanceHandle& instance, - const pp::NetAddress_Dev& addr, - uint16_t port) { +pp::NetAddress ReplacePort(const pp::InstanceHandle& instance, + const pp::NetAddress& addr, + uint16_t port) { switch (addr.GetFamily()) { case PP_NETADDRESS_FAMILY_IPV4: { - PP_NetAddress_IPv4_Dev ipv4_addr; + PP_NetAddress_IPv4 ipv4_addr; if (!addr.DescribeAsIPv4Address(&ipv4_addr)) break; ipv4_addr.port = ConvertToNetEndian16(port); - return pp::NetAddress_Dev(instance, ipv4_addr); + return pp::NetAddress(instance, ipv4_addr); } case PP_NETADDRESS_FAMILY_IPV6: { - PP_NetAddress_IPv6_Dev ipv6_addr; + PP_NetAddress_IPv6 ipv6_addr; if (!addr.DescribeAsIPv6Address(&ipv6_addr)) break; ipv6_addr.port = ConvertToNetEndian16(port); - return pp::NetAddress_Dev(instance, ipv6_addr); + return pp::NetAddress(instance, ipv6_addr); } default: { PP_NOTREACHED(); } } - return pp::NetAddress_Dev(); + return pp::NetAddress(); } } // namespace @@ -59,7 +59,7 @@ bool TestUDPSocket::Init() { if (!udp_socket_is_available) instance_->AppendError("PPB_UDPSocket interface not available"); - bool net_address_is_available = pp::NetAddress_Dev::IsAvailable(); + bool net_address_is_available = pp::NetAddress::IsAvailable(); if (!net_address_is_available) instance_->AppendError("PPB_NetAddress interface not available"); @@ -85,7 +85,7 @@ void TestUDPSocket::RunTests(const std::string& filter) { RUN_CALLBACK_TEST(TestUDPSocket, SetOption, filter); } -std::string TestUDPSocket::GetLocalAddress(pp::NetAddress_Dev* address) { +std::string TestUDPSocket::GetLocalAddress(pp::NetAddress* address) { pp::TCPSocket_Dev socket(instance_); TestCompletionCallback callback(instance_->pp_instance(), callback_type()); callback.WaitForResult(socket.Connect(address_, callback.GetCallback())); @@ -115,7 +115,7 @@ std::string TestUDPSocket::SetBroadcastOptions(pp::UDPSocket_Dev* socket) { } std::string TestUDPSocket::BindUDPSocket(pp::UDPSocket_Dev* socket, - const pp::NetAddress_Dev& address) { + const pp::NetAddress& address) { TestCompletionCallback callback(instance_->pp_instance(), callback_type()); callback.WaitForResult(socket->Bind(address, callback.GetCallback())); CHECK_CALLBACK_BEHAVIOR(callback); @@ -125,13 +125,13 @@ std::string TestUDPSocket::BindUDPSocket(pp::UDPSocket_Dev* socket, std::string TestUDPSocket::LookupPortAndBindUDPSocket( pp::UDPSocket_Dev* socket, - pp::NetAddress_Dev* address) { - pp::NetAddress_Dev base_address; + pp::NetAddress* address) { + pp::NetAddress base_address; ASSERT_SUBTEST_SUCCESS(GetLocalAddress(&base_address)); bool is_free_port_found = false; for (uint16_t port = kPortScanFrom; port < kPortScanTo; ++port) { - pp::NetAddress_Dev new_address = ReplacePort(instance_, base_address, port); + pp::NetAddress new_address = ReplacePort(instance_, base_address, port); ASSERT_NE(0, new_address.pp_resource()); if (BindUDPSocket(socket, new_address).empty()) { is_free_port_found = true; @@ -148,11 +148,11 @@ std::string TestUDPSocket::LookupPortAndBindUDPSocket( } std::string TestUDPSocket::ReadSocket(pp::UDPSocket_Dev* socket, - pp::NetAddress_Dev* address, + pp::NetAddress* address, size_t size, std::string* message) { std::vector<char> buffer(size); - TestCompletionCallbackWithOutput<pp::NetAddress_Dev> callback( + TestCompletionCallbackWithOutput<pp::NetAddress> callback( instance_->pp_instance(), callback_type()); callback.WaitForResult( socket->RecvFrom(&buffer[0], size, callback.GetCallback())); @@ -166,9 +166,9 @@ std::string TestUDPSocket::ReadSocket(pp::UDPSocket_Dev* socket, std::string TestUDPSocket::PassMessage(pp::UDPSocket_Dev* target, pp::UDPSocket_Dev* source, - const pp::NetAddress_Dev& target_address, + const pp::NetAddress& target_address, const std::string& message, - pp::NetAddress_Dev* recvfrom_address) { + pp::NetAddress* recvfrom_address) { TestCompletionCallback callback(instance_->pp_instance(), callback_type()); int32_t rv = source->SendTo(message.c_str(), message.size(), target_address, @@ -187,14 +187,14 @@ std::string TestUDPSocket::PassMessage(pp::UDPSocket_Dev* target, std::string TestUDPSocket::TestReadWrite() { pp::UDPSocket_Dev server_socket(instance_), client_socket(instance_); - pp::NetAddress_Dev server_address, client_address; + pp::NetAddress server_address, client_address; ASSERT_SUBTEST_SUCCESS(LookupPortAndBindUDPSocket(&server_socket, &server_address)); ASSERT_SUBTEST_SUCCESS(LookupPortAndBindUDPSocket(&client_socket, &client_address)); const std::string message = "Simple message that will be sent via UDP"; - pp::NetAddress_Dev recvfrom_address; + pp::NetAddress recvfrom_address; ASSERT_SUBTEST_SUCCESS(PassMessage(&server_socket, &client_socket, server_address, message, &recvfrom_address)); @@ -215,27 +215,27 @@ std::string TestUDPSocket::TestBroadcast() { ASSERT_SUBTEST_SUCCESS(SetBroadcastOptions(&server1)); ASSERT_SUBTEST_SUCCESS(SetBroadcastOptions(&server2)); - PP_NetAddress_IPv4_Dev any_ipv4_address = { 0, { 0, 0, 0, 0 } }; - pp::NetAddress_Dev any_address(instance_, any_ipv4_address); + PP_NetAddress_IPv4 any_ipv4_address = { 0, { 0, 0, 0, 0 } }; + pp::NetAddress any_address(instance_, any_ipv4_address); ASSERT_SUBTEST_SUCCESS(BindUDPSocket(&server1, any_address)); // Fill port field of |server_address|. - pp::NetAddress_Dev server_address = server1.GetBoundAddress(); + pp::NetAddress server_address = server1.GetBoundAddress(); ASSERT_NE(0, server_address.pp_resource()); ASSERT_SUBTEST_SUCCESS(BindUDPSocket(&server2, server_address)); - PP_NetAddress_IPv4_Dev server_ipv4_address; + PP_NetAddress_IPv4 server_ipv4_address; ASSERT_TRUE(server_address.DescribeAsIPv4Address(&server_ipv4_address)); - PP_NetAddress_IPv4_Dev broadcast_ipv4_address = { + PP_NetAddress_IPv4 broadcast_ipv4_address = { server_ipv4_address.port, { 0xff, 0xff, 0xff, 0xff } }; - pp::NetAddress_Dev broadcast_address(instance_, broadcast_ipv4_address); + pp::NetAddress broadcast_address(instance_, broadcast_ipv4_address); std::string message; const std::string first_message = "first message"; const std::string second_message = "second_message"; - pp::NetAddress_Dev recvfrom_address; + pp::NetAddress recvfrom_address; ASSERT_SUBTEST_SUCCESS(PassMessage(&server1, &server2, broadcast_address, first_message, &recvfrom_address)); // |first_message| was also received by |server2|. @@ -286,7 +286,7 @@ std::string TestUDPSocket::TestSetOption() { CHECK_CALLBACK_BEHAVIOR(callback); ASSERT_EQ(PP_ERROR_FAILED, callback.result()); - pp::NetAddress_Dev address; + pp::NetAddress address; ASSERT_SUBTEST_SUCCESS(LookupPortAndBindUDPSocket(&socket, &address)); // ADDRESS_REUSE and BROADCAST won't take effect after the socket is bound. diff --git a/ppapi/tests/test_udp_socket.h b/ppapi/tests/test_udp_socket.h index 986806c..66cc7a7 100644 --- a/ppapi/tests/test_udp_socket.h +++ b/ppapi/tests/test_udp_socket.h @@ -8,7 +8,7 @@ #include <string> #include "ppapi/c/pp_stdint.h" -#include "ppapi/cpp/dev/net_address_dev.h" +#include "ppapi/cpp/net_address.h" #include "ppapi/tests/test_case.h" namespace pp { @@ -24,27 +24,27 @@ class TestUDPSocket: public TestCase { virtual void RunTests(const std::string& filter); private: - std::string GetLocalAddress(pp::NetAddress_Dev* address); + std::string GetLocalAddress(pp::NetAddress* address); std::string SetBroadcastOptions(pp::UDPSocket_Dev* socket); std::string BindUDPSocket(pp::UDPSocket_Dev* socket, - const pp::NetAddress_Dev& address); + const pp::NetAddress& address); std::string LookupPortAndBindUDPSocket(pp::UDPSocket_Dev* socket, - pp::NetAddress_Dev* address); + pp::NetAddress* address); std::string ReadSocket(pp::UDPSocket_Dev* socket, - pp::NetAddress_Dev* address, + pp::NetAddress* address, size_t size, std::string* message); std::string PassMessage(pp::UDPSocket_Dev* target, pp::UDPSocket_Dev* source, - const pp::NetAddress_Dev& target_address, + const pp::NetAddress& target_address, const std::string& message, - pp::NetAddress_Dev* recvfrom_address); + pp::NetAddress* recvfrom_address); std::string TestReadWrite(); std::string TestBroadcast(); std::string TestSetOption(); - pp::NetAddress_Dev address_; + pp::NetAddress address_; }; #endif // PPAPI_TESTS_TEST_UDP_SOCKET_H_ diff --git a/ppapi/tests/test_utils.cc b/ppapi/tests/test_utils.cc index 509d6ff..e9814ea 100644 --- a/ppapi/tests/test_utils.cc +++ b/ppapi/tests/test_utils.cc @@ -14,9 +14,9 @@ #endif #include "ppapi/c/pp_errors.h" -#include "ppapi/cpp/dev/net_address_dev.h" #include "ppapi/cpp/instance_handle.h" #include "ppapi/cpp/module.h" +#include "ppapi/cpp/net_address.h" #include "ppapi/cpp/private/host_resolver_private.h" #include "ppapi/cpp/private/net_address_private.h" #include "ppapi/cpp/var.h" @@ -103,15 +103,14 @@ uint16_t ConvertToNetEndian16(uint16_t x) { return (x << 8) | (x >> 8); } -bool EqualNetAddress(const pp::NetAddress_Dev& addr1, - const pp::NetAddress_Dev& addr2) { +bool EqualNetAddress(const pp::NetAddress& addr1, const pp::NetAddress& addr2) { if (addr1.GetFamily() == PP_NETADDRESS_FAMILY_UNSPECIFIED || addr2.GetFamily() == PP_NETADDRESS_FAMILY_UNSPECIFIED) { return false; } if (addr1.GetFamily() == PP_NETADDRESS_FAMILY_IPV4) { - PP_NetAddress_IPv4_Dev ipv4_addr1, ipv4_addr2; + PP_NetAddress_IPv4 ipv4_addr1, ipv4_addr2; if (!addr1.DescribeAsIPv4Address(&ipv4_addr1) || !addr2.DescribeAsIPv4Address(&ipv4_addr2)) { return false; @@ -120,7 +119,7 @@ bool EqualNetAddress(const pp::NetAddress_Dev& addr1, return ipv4_addr1.port == ipv4_addr2.port && !memcmp(ipv4_addr1.addr, ipv4_addr2.addr, sizeof(ipv4_addr1.addr)); } else { - PP_NetAddress_IPv6_Dev ipv6_addr1, ipv6_addr2; + PP_NetAddress_IPv6 ipv6_addr1, ipv6_addr2; if (!addr1.DescribeAsIPv6Address(&ipv6_addr1) || !addr2.DescribeAsIPv6Address(&ipv6_addr2)) { return false; @@ -134,7 +133,7 @@ bool EqualNetAddress(const pp::NetAddress_Dev& addr1, bool ResolveHost(PP_Instance instance, const std::string& host, uint16_t port, - pp::NetAddress_Dev* addr) { + pp::NetAddress* addr) { // TODO(yzshen): Change to use the public host resolver once it is supported. pp::InstanceHandle instance_handle(instance); pp::HostResolverPrivate host_resolver(instance_handle); @@ -152,25 +151,25 @@ bool ResolveHost(PP_Instance instance, switch (pp::NetAddressPrivate::GetFamily(addr_private)) { case PP_NETADDRESSFAMILY_IPV4: { - PP_NetAddress_IPv4_Dev ipv4_addr; + PP_NetAddress_IPv4 ipv4_addr; ipv4_addr.port = ConvertToNetEndian16( pp::NetAddressPrivate::GetPort(addr_private)); if (!pp::NetAddressPrivate::GetAddress(addr_private, ipv4_addr.addr, sizeof(ipv4_addr.addr))) { return false; } - *addr = pp::NetAddress_Dev(instance_handle, ipv4_addr); + *addr = pp::NetAddress(instance_handle, ipv4_addr); return true; } case PP_NETADDRESSFAMILY_IPV6: { - PP_NetAddress_IPv6_Dev ipv6_addr; + PP_NetAddress_IPv6 ipv6_addr; ipv6_addr.port = ConvertToNetEndian16( pp::NetAddressPrivate::GetPort(addr_private)); if (!pp::NetAddressPrivate::GetAddress(addr_private, ipv6_addr.addr, sizeof(ipv6_addr.addr))) { return false; } - *addr = pp::NetAddress_Dev(instance_handle, ipv6_addr); + *addr = pp::NetAddress(instance_handle, ipv6_addr); return true; } default: { diff --git a/ppapi/tests/test_utils.h b/ppapi/tests/test_utils.h index 04aa452..8cd32d5 100644 --- a/ppapi/tests/test_utils.h +++ b/ppapi/tests/test_utils.h @@ -15,7 +15,7 @@ #include "ppapi/utility/completion_callback_factory.h" namespace pp { -class NetAddress_Dev; +class NetAddress; } // Timeout to wait for some action to complete. @@ -28,13 +28,12 @@ bool GetLocalHostPort(PP_Instance instance, std::string* host, uint16_t* port); uint16_t ConvertFromNetEndian16(uint16_t x); uint16_t ConvertToNetEndian16(uint16_t x); -bool EqualNetAddress(const pp::NetAddress_Dev& addr1, - const pp::NetAddress_Dev& addr2); +bool EqualNetAddress(const pp::NetAddress& addr1, const pp::NetAddress& addr2); // Only returns the first address if there are more than one available. bool ResolveHost(PP_Instance instance, const std::string& host, uint16_t port, - pp::NetAddress_Dev* addr); + pp::NetAddress* addr); // NestedEvent allows you to run a nested MessageLoop and wait for a particular // event to complete. For example, you can use it to wait for a callback on a diff --git a/ppapi/thunk/interfaces_ppb_public_dev.h b/ppapi/thunk/interfaces_ppb_public_dev.h index 514cd36..f18dfab 100644 --- a/ppapi/thunk/interfaces_ppb_public_dev.h +++ b/ppapi/thunk/interfaces_ppb_public_dev.h @@ -32,8 +32,6 @@ PROXIED_IFACE(NoAPIName, PPB_IME_INPUT_EVENT_DEV_INTERFACE_0_2, PROXIED_IFACE(NoAPIName, PPB_KEYBOARD_INPUT_EVENT_DEV_INTERFACE_0_1, PPB_KeyboardInputEvent_Dev_0_1) PROXIED_IFACE(NoAPIName, PPB_MEMORY_DEV_INTERFACE_0_1, PPB_Memory_Dev_0_1) -PROXIED_IFACE(NoAPIName, PPB_NETADDRESS_DEV_INTERFACE_0_1, - PPB_NetAddress_Dev_0_1) PROXIED_IFACE(NoAPIName, PPB_PRINTING_DEV_INTERFACE_0_7, PPB_Printing_Dev_0_7) PROXIED_IFACE(NoAPIName, PPB_RESOURCEARRAY_DEV_INTERFACE_0_1, diff --git a/ppapi/thunk/interfaces_ppb_public_stable.h b/ppapi/thunk/interfaces_ppb_public_stable.h index bc621d4..a59f447 100644 --- a/ppapi/thunk/interfaces_ppb_public_stable.h +++ b/ppapi/thunk/interfaces_ppb_public_stable.h @@ -72,6 +72,7 @@ PROXIED_IFACE(PPB_Instance, PPB_FULLSCREEN_INTERFACE_1_0, PPB_Fullscreen_1_0) PROXIED_IFACE(PPB_Instance, PPB_MESSAGING_INTERFACE_1_0, PPB_Messaging_1_0) PROXIED_IFACE(PPB_Instance, PPB_MOUSECURSOR_INTERFACE_1_0, PPB_MouseCursor_1_0) PROXIED_IFACE(PPB_Instance, PPB_MOUSELOCK_INTERFACE_1_0, PPB_MouseLock_1_0) +PROXIED_IFACE(NoAPIName, PPB_NETADDRESS_INTERFACE_1_0, PPB_NetAddress_1_0) PROXIED_IFACE(NoAPIName, PPB_URLLOADER_INTERFACE_1_0, PPB_URLLoader_1_0) PROXIED_IFACE(NoAPIName, PPB_URLREQUESTINFO_INTERFACE_1_0, PPB_URLRequestInfo_1_0) diff --git a/ppapi/thunk/ppb_net_address_api.h b/ppapi/thunk/ppb_net_address_api.h index 7a22c3c..7ae9d7f 100644 --- a/ppapi/thunk/ppb_net_address_api.h +++ b/ppapi/thunk/ppb_net_address_api.h @@ -5,7 +5,7 @@ #ifndef PPAPI_THUNK_PPB_NET_ADDRESS_API_H_ #define PPAPI_THUNK_PPB_NET_ADDRESS_API_H_ -#include "ppapi/c/dev/ppb_net_address_dev.h" +#include "ppapi/c/ppb_net_address.h" #include "ppapi/thunk/ppapi_thunk_export.h" struct PP_NetAddress_Private; @@ -17,10 +17,10 @@ class PPAPI_THUNK_EXPORT PPB_NetAddress_API { public: virtual ~PPB_NetAddress_API() {} - virtual PP_NetAddress_Family_Dev GetFamily() = 0; + virtual PP_NetAddress_Family GetFamily() = 0; virtual PP_Var DescribeAsString(PP_Bool include_port) = 0; - virtual PP_Bool DescribeAsIPv4Address(PP_NetAddress_IPv4_Dev* ipv4_addr) = 0; - virtual PP_Bool DescribeAsIPv6Address(PP_NetAddress_IPv6_Dev* ipv6_addr) = 0; + virtual PP_Bool DescribeAsIPv4Address(PP_NetAddress_IPv4* ipv4_addr) = 0; + virtual PP_Bool DescribeAsIPv6Address(PP_NetAddress_IPv6* ipv6_addr) = 0; virtual const PP_NetAddress_Private& GetNetAddressPrivate() = 0; }; diff --git a/ppapi/thunk/ppb_net_address_dev_thunk.cc b/ppapi/thunk/ppb_net_address_thunk.cc index 9f0e508..f8916fe 100644 --- a/ppapi/thunk/ppb_net_address_dev_thunk.cc +++ b/ppapi/thunk/ppb_net_address_thunk.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ppapi/c/dev/ppb_net_address_dev.h" #include "ppapi/c/pp_errors.h" +#include "ppapi/c/ppb_net_address.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" #include "ppapi/thunk/ppb_instance_api.h" @@ -18,8 +18,8 @@ namespace { PP_Resource CreateFromIPv4Address( PP_Instance instance, - const struct PP_NetAddress_IPv4_Dev* ipv4_addr) { - VLOG(4) << "PPB_NetAddress_Dev::CreateFromIPv4Address()"; + const struct PP_NetAddress_IPv4* ipv4_addr) { + VLOG(4) << "PPB_NetAddress::CreateFromIPv4Address()"; EnterResourceCreation enter(instance); if (enter.failed()) return 0; @@ -29,8 +29,8 @@ PP_Resource CreateFromIPv4Address( PP_Resource CreateFromIPv6Address( PP_Instance instance, - const struct PP_NetAddress_IPv6_Dev* ipv6_addr) { - VLOG(4) << "PPB_NetAddress_Dev::CreateFromIPv6Address()"; + const struct PP_NetAddress_IPv6* ipv6_addr) { + VLOG(4) << "PPB_NetAddress::CreateFromIPv6Address()"; EnterResourceCreation enter(instance); if (enter.failed()) return 0; @@ -38,14 +38,14 @@ PP_Resource CreateFromIPv6Address( ipv6_addr); } -PP_Bool IsNetAddress(PP_Resource addr) { - VLOG(4) << "PPB_NetAddress_Dev::IsNetAddress()"; - EnterResource<PPB_NetAddress_API> enter(addr, false); +PP_Bool IsNetAddress(PP_Resource resource) { + VLOG(4) << "PPB_NetAddress::IsNetAddress()"; + EnterResource<PPB_NetAddress_API> enter(resource, false); return PP_FromBool(enter.succeeded()); } -PP_NetAddress_Family_Dev GetFamily(PP_Resource addr) { - VLOG(4) << "PPB_NetAddress_Dev::GetFamily()"; +PP_NetAddress_Family GetFamily(PP_Resource addr) { + VLOG(4) << "PPB_NetAddress::GetFamily()"; EnterResource<PPB_NetAddress_API> enter(addr, true); if (enter.failed()) return PP_NETADDRESS_FAMILY_UNSPECIFIED; @@ -53,7 +53,7 @@ PP_NetAddress_Family_Dev GetFamily(PP_Resource addr) { } struct PP_Var DescribeAsString(PP_Resource addr, PP_Bool include_port) { - VLOG(4) << "PPB_NetAddress_Dev::DescribeAsString()"; + VLOG(4) << "PPB_NetAddress::DescribeAsString()"; EnterResource<PPB_NetAddress_API> enter(addr, true); if (enter.failed()) return PP_MakeUndefined(); @@ -61,8 +61,8 @@ struct PP_Var DescribeAsString(PP_Resource addr, PP_Bool include_port) { } PP_Bool DescribeAsIPv4Address(PP_Resource addr, - struct PP_NetAddress_IPv4_Dev* ipv4_addr) { - VLOG(4) << "PPB_NetAddress_Dev::DescribeAsIPv4Address()"; + struct PP_NetAddress_IPv4* ipv4_addr) { + VLOG(4) << "PPB_NetAddress::DescribeAsIPv4Address()"; EnterResource<PPB_NetAddress_API> enter(addr, true); if (enter.failed()) return PP_FALSE; @@ -70,15 +70,15 @@ PP_Bool DescribeAsIPv4Address(PP_Resource addr, } PP_Bool DescribeAsIPv6Address(PP_Resource addr, - struct PP_NetAddress_IPv6_Dev* ipv6_addr) { - VLOG(4) << "PPB_NetAddress_Dev::DescribeAsIPv6Address()"; + struct PP_NetAddress_IPv6* ipv6_addr) { + VLOG(4) << "PPB_NetAddress::DescribeAsIPv6Address()"; EnterResource<PPB_NetAddress_API> enter(addr, true); if (enter.failed()) return PP_FALSE; return enter.object()->DescribeAsIPv6Address(ipv6_addr); } -const PPB_NetAddress_Dev_0_1 g_ppb_netaddress_dev_thunk_0_1 = { +const PPB_NetAddress_1_0 g_ppb_netaddress_thunk_1_0 = { &CreateFromIPv4Address, &CreateFromIPv6Address, &IsNetAddress, @@ -90,8 +90,8 @@ const PPB_NetAddress_Dev_0_1 g_ppb_netaddress_dev_thunk_0_1 = { } // namespace -const PPB_NetAddress_Dev_0_1* GetPPB_NetAddress_Dev_0_1_Thunk() { - return &g_ppb_netaddress_dev_thunk_0_1; +const PPB_NetAddress_1_0* GetPPB_NetAddress_1_0_Thunk() { + return &g_ppb_netaddress_thunk_1_0; } } // namespace thunk diff --git a/ppapi/thunk/resource_creation_api.h b/ppapi/thunk/resource_creation_api.h index 7bb0043..082f1cc 100644 --- a/ppapi/thunk/resource_creation_api.h +++ b/ppapi/thunk/resource_creation_api.h @@ -26,8 +26,8 @@ struct PP_Flash_Menu; struct PP_FontDescription_Dev; struct PP_BrowserFont_Trusted_Description; -struct PP_NetAddress_IPv4_Dev; -struct PP_NetAddress_IPv6_Dev; +struct PP_NetAddress_IPv4; +struct PP_NetAddress_IPv6; struct PP_NetAddress_Private; struct PP_Size; @@ -142,10 +142,10 @@ class ResourceCreationAPI { PP_Bool init_to_zero) = 0; virtual PP_Resource CreateNetAddressFromIPv4Address( PP_Instance instance, - const PP_NetAddress_IPv4_Dev* ipv4_addr) = 0; + const PP_NetAddress_IPv4* ipv4_addr) = 0; virtual PP_Resource CreateNetAddressFromIPv6Address( PP_Instance instance, - const PP_NetAddress_IPv6_Dev* ipv6_addr) = 0; + const PP_NetAddress_IPv6* ipv6_addr) = 0; virtual PP_Resource CreateNetAddressFromNetAddressPrivate( PP_Instance instance, const PP_NetAddress_Private& private_addr) = 0; |