| Index: ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
|
| 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 2bd59161524d523c4f8ec7cd7c67445d9bc2b8de..f48f42de98b52bbef0221220d79d60d670f2646f 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
|
| @@ -3,7 +3,7 @@
|
| * found in the LICENSE file.
|
| */
|
|
|
| -/* Last generated from IDL: Thu Oct 4 11:25:54 2012. */
|
| +/* Last generated from IDL: Thu Oct 4 12:24:28 2012. */
|
| #include "ppapi/generators/pnacl_shim.h"
|
|
|
| #include "ppapi/c/ppb.h"
|
| @@ -83,6 +83,7 @@
|
| #include "ppapi/c/private/ppb_tcp_server_socket_private.h"
|
| #include "ppapi/c/private/ppb_tcp_socket_private.h"
|
| #include "ppapi/c/private/ppb_udp_socket_private.h"
|
| +#include "ppapi/c/private/ppb_uma_private.h"
|
| #include "ppapi/c/private/ppb_x509_certificate_private.h"
|
| #include "ppapi/c/private/ppp_content_decryptor_private.h"
|
| #include "ppapi/c/private/ppp_flash_browser_operations.h"
|
| @@ -230,6 +231,7 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TCPSocket_Private_0_4;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_2;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_3;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_4;
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_UMA_Private_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_X509Certificate_Private_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPP_ContentDecryptor_Private_0_2;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPP_Flash_BrowserOperations_1_0;
|
| @@ -3276,6 +3278,28 @@ void Pnacl_M23_PPB_UDPSocket_Private_Close(PP_Resource udp_socket) {
|
|
|
| /* End wrapper methods for PPB_UDPSocket_Private_0_4 */
|
|
|
| +/* Begin wrapper methods for PPB_UMA_Private_0_1 */
|
| +
|
| +static __attribute__((pnaclcall))
|
| +void Pnacl_M18_PPB_UMA_Private_HistogramCustomTimes(struct PP_Var name, int64_t sample, int64_t min, int64_t max, uint32_t bucket_count) {
|
| + const struct PPB_UMA_Private_0_1 *iface = Pnacl_WrapperInfo_PPB_UMA_Private_0_1.real_iface;
|
| + iface->HistogramCustomTimes(name, sample, min, max, bucket_count);
|
| +}
|
| +
|
| +static __attribute__((pnaclcall))
|
| +void Pnacl_M18_PPB_UMA_Private_HistogramCustomCounts(struct PP_Var name, int32_t sample, int32_t min, int32_t max, uint32_t bucket_count) {
|
| + const struct PPB_UMA_Private_0_1 *iface = Pnacl_WrapperInfo_PPB_UMA_Private_0_1.real_iface;
|
| + iface->HistogramCustomCounts(name, sample, min, max, bucket_count);
|
| +}
|
| +
|
| +static __attribute__((pnaclcall))
|
| +void Pnacl_M18_PPB_UMA_Private_HistogramEnumeration(struct PP_Var name, int32_t sample, int32_t boundary_value) {
|
| + const struct PPB_UMA_Private_0_1 *iface = Pnacl_WrapperInfo_PPB_UMA_Private_0_1.real_iface;
|
| + iface->HistogramEnumeration(name, sample, boundary_value);
|
| +}
|
| +
|
| +/* End wrapper methods for PPB_UMA_Private_0_1 */
|
| +
|
| /* Begin wrapper methods for PPB_X509Certificate_Private_0_1 */
|
|
|
| static __attribute__((pnaclcall))
|
| @@ -4107,6 +4131,12 @@ struct PPB_UDPSocket_Private_0_4 Pnacl_Wrappers_PPB_UDPSocket_Private_0_4 = {
|
| .Close = (void (*)(PP_Resource udp_socket))&Pnacl_M23_PPB_UDPSocket_Private_Close
|
| };
|
|
|
| +struct PPB_UMA_Private_0_1 Pnacl_Wrappers_PPB_UMA_Private_0_1 = {
|
| + .HistogramCustomTimes = (void (*)(struct PP_Var name, int64_t sample, int64_t min, int64_t max, uint32_t bucket_count))&Pnacl_M18_PPB_UMA_Private_HistogramCustomTimes,
|
| + .HistogramCustomCounts = (void (*)(struct PP_Var name, int32_t sample, int32_t min, int32_t max, uint32_t bucket_count))&Pnacl_M18_PPB_UMA_Private_HistogramCustomCounts,
|
| + .HistogramEnumeration = (void (*)(struct PP_Var name, int32_t sample, int32_t boundary_value))&Pnacl_M18_PPB_UMA_Private_HistogramEnumeration
|
| +};
|
| +
|
| struct PPB_X509Certificate_Private_0_1 Pnacl_Wrappers_PPB_X509Certificate_Private_0_1 = {
|
| .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M19_PPB_X509Certificate_Private_Create,
|
| .IsX509CertificatePrivate = (PP_Bool (*)(PP_Resource resource))&Pnacl_M19_PPB_X509Certificate_Private_IsX509CertificatePrivate,
|
| @@ -4852,6 +4882,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_4 = {
|
| .real_iface = NULL
|
| };
|
|
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_UMA_Private_0_1 = {
|
| + .iface_macro = PPB_UMA_PRIVATE_INTERFACE_0_1,
|
| + .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_UMA_Private_0_1,
|
| + .real_iface = NULL
|
| +};
|
| +
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_X509Certificate_Private_0_1 = {
|
| .iface_macro = PPB_X509CERTIFICATE_PRIVATE_INTERFACE_0_1,
|
| .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_X509Certificate_Private_0_1,
|
| @@ -4995,6 +5031,7 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
|
| &Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_2,
|
| &Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_3,
|
| &Pnacl_WrapperInfo_PPB_UDPSocket_Private_0_4,
|
| + &Pnacl_WrapperInfo_PPB_UMA_Private_0_1,
|
| &Pnacl_WrapperInfo_PPB_X509Certificate_Private_0_1,
|
| NULL
|
| };
|
|
|