| 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 cbe04ba28e029cedbf8b21aef67880c7a8e68c38..57bd0f7228448c83da9e1c1388038ecd6d8f9ec4 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
|
| @@ -1,4 +1,4 @@
|
| -/* Copyright (c) 2015 The Chromium Authors. All rights reserved.
|
| +/* Copyright (c) 2016 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.
|
| */
|
| @@ -49,6 +49,7 @@
|
| #include "ppapi/c/ppb_var_dictionary.h"
|
| #include "ppapi/c/ppb_video_decoder.h"
|
| #include "ppapi/c/ppb_video_encoder.h"
|
| +#include "ppapi/c/ppb_vpn_provider.h"
|
| #include "ppapi/c/ppb_websocket.h"
|
| #include "ppapi/c/ppp_messaging.h"
|
| #include "ppapi/c/private/ppb_camera_device_private.h"
|
| @@ -149,6 +150,7 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoDecoder_1_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoDecoder_1_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoEncoder_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoEncoder_0_2;
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VpnProvider_0_1;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_WebSocket_1_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPP_Messaging_1_0;
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_3;
|
| @@ -2456,6 +2458,40 @@ static void Pnacl_M44_PPB_VideoEncoder_Close(PP_Resource video_encoder) {
|
|
|
| /* Not generating wrapper methods for PPB_View_1_2 */
|
|
|
| +/* Begin wrapper methods for PPB_VpnProvider_0_1 */
|
| +
|
| +static PP_Resource Pnacl_M51_PPB_VpnProvider_Create(PP_Instance instance) {
|
| + const struct PPB_VpnProvider_0_1 *iface = Pnacl_WrapperInfo_PPB_VpnProvider_0_1.real_iface;
|
| + return iface->Create(instance);
|
| +}
|
| +
|
| +static PP_Bool Pnacl_M51_PPB_VpnProvider_IsVpnProvider(PP_Resource resource) {
|
| + const struct PPB_VpnProvider_0_1 *iface = Pnacl_WrapperInfo_PPB_VpnProvider_0_1.real_iface;
|
| + return iface->IsVpnProvider(resource);
|
| +}
|
| +
|
| +static int32_t Pnacl_M51_PPB_VpnProvider_Bind(PP_Resource vpn_provider, struct PP_Var* name, struct PP_Var* id, struct PP_CompletionCallback* callback) {
|
| + const struct PPB_VpnProvider_0_1 *iface = Pnacl_WrapperInfo_PPB_VpnProvider_0_1.real_iface;
|
| + return iface->Bind(vpn_provider, *name, *id, *callback);
|
| +}
|
| +
|
| +static int32_t Pnacl_M51_PPB_VpnProvider_GetUnBindEvent(PP_Resource vpn_provider, struct PP_CompletionCallback* callback) {
|
| + const struct PPB_VpnProvider_0_1 *iface = Pnacl_WrapperInfo_PPB_VpnProvider_0_1.real_iface;
|
| + return iface->GetUnBindEvent(vpn_provider, *callback);
|
| +}
|
| +
|
| +static int32_t Pnacl_M51_PPB_VpnProvider_SendPacket(PP_Resource vpn_provider, struct PP_Var* packet, struct PP_CompletionCallback* callback) {
|
| + const struct PPB_VpnProvider_0_1 *iface = Pnacl_WrapperInfo_PPB_VpnProvider_0_1.real_iface;
|
| + return iface->SendPacket(vpn_provider, *packet, *callback);
|
| +}
|
| +
|
| +static int32_t Pnacl_M51_PPB_VpnProvider_GetPacket(PP_Resource vpn_provider, struct PP_Var* packet, struct PP_CompletionCallback* callback) {
|
| + const struct PPB_VpnProvider_0_1 *iface = Pnacl_WrapperInfo_PPB_VpnProvider_0_1.real_iface;
|
| + return iface->GetPacket(vpn_provider, packet, *callback);
|
| +}
|
| +
|
| +/* End wrapper methods for PPB_VpnProvider_0_1 */
|
| +
|
| /* Begin wrapper methods for PPB_WebSocket_1_0 */
|
|
|
| static PP_Resource Pnacl_M18_PPB_WebSocket_Create(PP_Instance instance) {
|
| @@ -5228,6 +5264,15 @@ static const struct PPB_VideoEncoder_0_2 Pnacl_Wrappers_PPB_VideoEncoder_0_2 = {
|
|
|
| /* Not generating wrapper interface for PPB_View_1_2 */
|
|
|
| +static const struct PPB_VpnProvider_0_1 Pnacl_Wrappers_PPB_VpnProvider_0_1 = {
|
| + .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M51_PPB_VpnProvider_Create,
|
| + .IsVpnProvider = (PP_Bool (*)(PP_Resource resource))&Pnacl_M51_PPB_VpnProvider_IsVpnProvider,
|
| + .Bind = (int32_t (*)(PP_Resource vpn_provider, struct PP_Var name, struct PP_Var id, struct PP_CompletionCallback callback))&Pnacl_M51_PPB_VpnProvider_Bind,
|
| + .GetUnBindEvent = (int32_t (*)(PP_Resource vpn_provider, struct PP_CompletionCallback callback))&Pnacl_M51_PPB_VpnProvider_GetUnBindEvent,
|
| + .SendPacket = (int32_t (*)(PP_Resource vpn_provider, struct PP_Var packet, struct PP_CompletionCallback callback))&Pnacl_M51_PPB_VpnProvider_SendPacket,
|
| + .GetPacket = (int32_t (*)(PP_Resource vpn_provider, struct PP_Var* packet, struct PP_CompletionCallback callback))&Pnacl_M51_PPB_VpnProvider_GetPacket
|
| +};
|
| +
|
| static const struct PPB_WebSocket_1_0 Pnacl_Wrappers_PPB_WebSocket_1_0 = {
|
| .Create = (PP_Resource (*)(PP_Instance instance))&Pnacl_M18_PPB_WebSocket_Create,
|
| .IsWebSocket = (PP_Bool (*)(PP_Resource resource))&Pnacl_M18_PPB_WebSocket_IsWebSocket,
|
| @@ -6175,6 +6220,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoEncoder_0_2 = {
|
| .real_iface = NULL
|
| };
|
|
|
| +static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VpnProvider_0_1 = {
|
| + .iface_macro = PPB_VPNPROVIDER_INTERFACE_0_1,
|
| + .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_VpnProvider_0_1,
|
| + .real_iface = NULL
|
| +};
|
| +
|
| static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_WebSocket_1_0 = {
|
| .iface_macro = PPB_WEBSOCKET_INTERFACE_1_0,
|
| .wrapped_iface = (const void *) &Pnacl_Wrappers_PPB_WebSocket_1_0,
|
| @@ -6562,6 +6613,7 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
|
| &Pnacl_WrapperInfo_PPB_VideoDecoder_1_1,
|
| &Pnacl_WrapperInfo_PPB_VideoEncoder_0_1,
|
| &Pnacl_WrapperInfo_PPB_VideoEncoder_0_2,
|
| + &Pnacl_WrapperInfo_PPB_VpnProvider_0_1,
|
| &Pnacl_WrapperInfo_PPB_WebSocket_1_0,
|
| &Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_3,
|
| &Pnacl_WrapperInfo_PPB_AudioInput_Dev_0_4,
|
|
|