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 cc3644cc9d916d39d7ae0daa497ea5c42b4b8525..902c8cdf212c7e9178633ad2ed4599d58ec1143a 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 |
@@ -263,6 +263,7 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_NetAddress_Private_1_1; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_NetworkList_Private_0_2; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_NetworkMonitor_Private_0_2; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Talk_Private_1_0; |
+static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Talk_Private_2_0; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TCPServerSocket_Private_0_1; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TCPServerSocket_Private_0_2; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TCPSocket_Private_0_3; |
@@ -2979,6 +2980,30 @@ static int32_t Pnacl_M19_PPB_Talk_Private_GetPermission(PP_Resource talk_resourc |
/* End wrapper methods for PPB_Talk_Private_1_0 */ |
+/* Begin wrapper methods for PPB_Talk_Private_2_0 */ |
+ |
+static PP_Resource Pnacl_M29_PPB_Talk_Private_Create(PP_Instance instance) { |
+ const struct PPB_Talk_Private_2_0 *iface = Pnacl_WrapperInfo_PPB_Talk_Private_2_0.real_iface; |
+ return iface->Create(instance); |
+} |
+ |
+static int32_t Pnacl_M29_PPB_Talk_Private_RequestPermission(PP_Resource talk_resource, PP_TalkPermission permission, struct PP_CompletionCallback* callback) { |
+ const struct PPB_Talk_Private_2_0 *iface = Pnacl_WrapperInfo_PPB_Talk_Private_2_0.real_iface; |
+ return iface->RequestPermission(talk_resource, permission, *callback); |
+} |
+ |
+static int32_t Pnacl_M29_PPB_Talk_Private_StartRemoting(PP_Resource talk_resource, PP_TalkEventCallback event_callback, void* user_data) { |
+ const struct PPB_Talk_Private_2_0 *iface = Pnacl_WrapperInfo_PPB_Talk_Private_2_0.real_iface; |
+ return iface->StartRemoting(talk_resource, event_callback, user_data); |
+} |
+ |
+static void Pnacl_M29_PPB_Talk_Private_StopRemoting(PP_Resource talk_resource) { |
+ const struct PPB_Talk_Private_2_0 *iface = Pnacl_WrapperInfo_PPB_Talk_Private_2_0.real_iface; |
+ iface->StopRemoting(talk_resource); |
+} |
+ |
+/* End wrapper methods for PPB_Talk_Private_2_0 */ |
+ |
/* Begin wrapper methods for PPB_TCPServerSocket_Private_0_1 */ |
static PP_Resource Pnacl_M18_PPB_TCPServerSocket_Private_Create(PP_Instance instance) { |
@@ -4566,6 +4591,13 @@ struct PPB_Talk_Private_1_0 Pnacl_Wrappers_PPB_Talk_Private_1_0 = { |
.GetPermission = (int32_t (*)(PP_Resource talk_resource, struct PP_CompletionCallback callback))&Pnacl_M19_PPB_Talk_Private_GetPermission |
}; |
+struct PPB_Talk_Private_2_0 Pnacl_Wrappers_PPB_Talk_Private_2_0 = { |
+ .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M29_PPB_Talk_Private_Create, |
+ .RequestPermission = (int32_t (*)(PP_Resource talk_resource, PP_TalkPermission permission, struct PP_CompletionCallback callback))&Pnacl_M29_PPB_Talk_Private_RequestPermission, |
+ .StartRemoting = (int32_t (*)(PP_Resource talk_resource, PP_TalkEventCallback event_callback, void* user_data))&Pnacl_M29_PPB_Talk_Private_StartRemoting, |
+ .StopRemoting = (void (*)(PP_Resource talk_resource))&Pnacl_M29_PPB_Talk_Private_StopRemoting |
+}; |
+ |
struct PPB_TCPServerSocket_Private_0_1 Pnacl_Wrappers_PPB_TCPServerSocket_Private_0_1 = { |
.Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M18_PPB_TCPServerSocket_Private_Create, |
.IsTCPServerSocket = (PP_Bool (*)(PP_Resource resource))&Pnacl_M18_PPB_TCPServerSocket_Private_IsTCPServerSocket, |
@@ -5551,6 +5583,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Talk_Private_1_0 = { |
.real_iface = NULL |
}; |
+static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Talk_Private_2_0 = { |
+ .iface_macro = PPB_TALK_PRIVATE_INTERFACE_2_0, |
+ .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_Talk_Private_2_0, |
+ .real_iface = NULL |
+}; |
+ |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_TCPServerSocket_Private_0_1 = { |
.iface_macro = PPB_TCPSERVERSOCKET_PRIVATE_INTERFACE_0_1, |
.wrapped_iface = (void *) &Pnacl_Wrappers_PPB_TCPServerSocket_Private_0_1, |
@@ -5791,6 +5829,7 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = { |
&Pnacl_WrapperInfo_PPB_NetworkList_Private_0_2, |
&Pnacl_WrapperInfo_PPB_NetworkMonitor_Private_0_2, |
&Pnacl_WrapperInfo_PPB_Talk_Private_1_0, |
+ &Pnacl_WrapperInfo_PPB_Talk_Private_2_0, |
&Pnacl_WrapperInfo_PPB_TCPServerSocket_Private_0_1, |
&Pnacl_WrapperInfo_PPB_TCPServerSocket_Private_0_2, |
&Pnacl_WrapperInfo_PPB_TCPSocket_Private_0_3, |