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 8aba703410224a6ee871a4ca1a116ff44e860e21..d7c4b8a4f0f0e991b078b8d6f900c665923ac908 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 |
@@ -159,6 +159,7 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPP_Messaging_1_0; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPP_MouseLock_1_0; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_AudioTrusted_0_6; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_BrokerTrusted_0_2; |
+static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_BrokerTrusted_0_3; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_BrowserFont_Trusted_1_0; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_BufferTrusted_0_1; |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_CharSet_Trusted_1_0; |
@@ -1280,6 +1281,40 @@ int32_t Pnacl_M14_PPB_BrokerTrusted_GetHandle(PP_Resource broker, int32_t* handl |
/* End wrapper methods for PPB_BrokerTrusted_0_2 */ |
+/* Begin wrapper methods for PPB_BrokerTrusted_0_3 */ |
+ |
+static __attribute__((pnaclcall)) |
+PP_Resource Pnacl_M25_PPB_BrokerTrusted_CreateTrusted(PP_Instance instance) { |
+ const struct PPB_BrokerTrusted_0_3 *iface = Pnacl_WrapperInfo_PPB_BrokerTrusted_0_3.real_iface; |
+ return iface->CreateTrusted(instance); |
+} |
+ |
+static __attribute__((pnaclcall)) |
+PP_Bool Pnacl_M25_PPB_BrokerTrusted_IsBrokerTrusted(PP_Resource resource) { |
+ const struct PPB_BrokerTrusted_0_3 *iface = Pnacl_WrapperInfo_PPB_BrokerTrusted_0_3.real_iface; |
+ return iface->IsBrokerTrusted(resource); |
+} |
+ |
+static __attribute__((pnaclcall)) |
+int32_t Pnacl_M25_PPB_BrokerTrusted_Connect(PP_Resource broker, struct PP_CompletionCallback connect_callback) { |
+ const struct PPB_BrokerTrusted_0_3 *iface = Pnacl_WrapperInfo_PPB_BrokerTrusted_0_3.real_iface; |
+ return iface->Connect(broker, connect_callback); |
+} |
+ |
+static __attribute__((pnaclcall)) |
+int32_t Pnacl_M25_PPB_BrokerTrusted_GetHandle(PP_Resource broker, int32_t* handle) { |
+ const struct PPB_BrokerTrusted_0_3 *iface = Pnacl_WrapperInfo_PPB_BrokerTrusted_0_3.real_iface; |
+ return iface->GetHandle(broker, handle); |
+} |
+ |
+static __attribute__((pnaclcall)) |
+PP_Bool Pnacl_M25_PPB_BrokerTrusted_IsAllowed(PP_Resource broker) { |
+ const struct PPB_BrokerTrusted_0_3 *iface = Pnacl_WrapperInfo_PPB_BrokerTrusted_0_3.real_iface; |
+ return iface->IsAllowed(broker); |
+} |
+ |
+/* End wrapper methods for PPB_BrokerTrusted_0_3 */ |
+ |
/* Begin wrapper methods for PPB_BrowserFont_Trusted_1_0 */ |
static __attribute__((pnaclcall)) |
@@ -3633,6 +3668,14 @@ struct PPB_BrokerTrusted_0_2 Pnacl_Wrappers_PPB_BrokerTrusted_0_2 = { |
.GetHandle = (int32_t (*)(PP_Resource broker, int32_t* handle))&Pnacl_M14_PPB_BrokerTrusted_GetHandle |
}; |
+struct PPB_BrokerTrusted_0_3 Pnacl_Wrappers_PPB_BrokerTrusted_0_3 = { |
+ .CreateTrusted = (PP_Resource (*)(PP_Instance instance))&Pnacl_M25_PPB_BrokerTrusted_CreateTrusted, |
+ .IsBrokerTrusted = (PP_Bool (*)(PP_Resource resource))&Pnacl_M25_PPB_BrokerTrusted_IsBrokerTrusted, |
+ .Connect = (int32_t (*)(PP_Resource broker, struct PP_CompletionCallback connect_callback))&Pnacl_M25_PPB_BrokerTrusted_Connect, |
+ .GetHandle = (int32_t (*)(PP_Resource broker, int32_t* handle))&Pnacl_M25_PPB_BrokerTrusted_GetHandle, |
+ .IsAllowed = (PP_Bool (*)(PP_Resource broker))&Pnacl_M25_PPB_BrokerTrusted_IsAllowed |
+}; |
+ |
struct PPB_BrowserFont_Trusted_1_0 Pnacl_Wrappers_PPB_BrowserFont_Trusted_1_0 = { |
.GetFontFamilies = (struct PP_Var (*)(PP_Instance instance))&Pnacl_M19_PPB_BrowserFont_Trusted_GetFontFamilies, |
.Create = (PP_Resource (*)(PP_Instance instance, const struct PP_BrowserFont_Trusted_Description* description))&Pnacl_M19_PPB_BrowserFont_Trusted_Create, |
@@ -4412,6 +4455,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_BrokerTrusted_0_2 = { |
.real_iface = NULL |
}; |
+static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_BrokerTrusted_0_3 = { |
+ .iface_macro = PPB_BROKER_TRUSTED_INTERFACE_0_3, |
+ .wrapped_iface = (void *) &Pnacl_Wrappers_PPB_BrokerTrusted_0_3, |
+ .real_iface = NULL |
+}; |
+ |
static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_BrowserFont_Trusted_1_0 = { |
.iface_macro = PPB_BROWSERFONT_TRUSTED_INTERFACE_1_0, |
.wrapped_iface = (void *) &Pnacl_Wrappers_PPB_BrowserFont_Trusted_1_0, |
@@ -4994,6 +5043,7 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = { |
&Pnacl_WrapperInfo_PPB_WebSocket_1_0, |
&Pnacl_WrapperInfo_PPB_AudioTrusted_0_6, |
&Pnacl_WrapperInfo_PPB_BrokerTrusted_0_2, |
+ &Pnacl_WrapperInfo_PPB_BrokerTrusted_0_3, |
&Pnacl_WrapperInfo_PPB_BrowserFont_Trusted_1_0, |
&Pnacl_WrapperInfo_PPB_BufferTrusted_0_1, |
&Pnacl_WrapperInfo_PPB_CharSet_Trusted_1_0, |