| 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 78ef836d31e0dadecf8819f5465253afe4563794..f77366e1e1b09878c954c1aa549347eafd34e2e2 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
|
| @@ -3593,13 +3593,11 @@ static PP_Bool Pnacl_M19_PPB_HostResolver_Private_GetNetAddress(PP_Resource host
|
|
|
| /* End wrapper methods for PPB_HostResolver_Private_0_1 */
|
|
|
| -/* Not generating wrapper methods for PPB_ImageCaptureConfig_Private_0_1 */
|
| -
|
| /* Begin wrapper methods for PPB_ImageCapture_Private_0_1 */
|
|
|
| -static PP_Resource Pnacl_M39_PPB_ImageCapture_Private_Create(PP_Instance instance, struct PP_Var* camera_source_id, PPB_ImageCapture_Private_ErrorCallback error_callback, void* user_data) {
|
| +static PP_Resource Pnacl_M39_PPB_ImageCapture_Private_Create(PP_Instance instance, struct PP_Var* camera_source_id, void* user_data) {
|
| const struct PPB_ImageCapture_Private_0_1 *iface = Pnacl_WrapperInfo_PPB_ImageCapture_Private_0_1.real_iface;
|
| - return iface->Create(instance, *camera_source_id, error_callback, user_data);
|
| + return iface->Create(instance, *camera_source_id, user_data);
|
| }
|
|
|
| static PP_Bool Pnacl_M39_PPB_ImageCapture_Private_IsImageCapture(PP_Resource resource) {
|
| @@ -3612,26 +3610,11 @@ static int32_t Pnacl_M39_PPB_ImageCapture_Private_Close(PP_Resource resource, st
|
| return iface->Close(resource, *callback);
|
| }
|
|
|
| -static int32_t Pnacl_M39_PPB_ImageCapture_Private_SetConfig(PP_Resource image_capture, PP_Resource config, struct PP_CompletionCallback* callback) {
|
| - const struct PPB_ImageCapture_Private_0_1 *iface = Pnacl_WrapperInfo_PPB_ImageCapture_Private_0_1.real_iface;
|
| - return iface->SetConfig(image_capture, config, *callback);
|
| -}
|
| -
|
| -static int32_t Pnacl_M39_PPB_ImageCapture_Private_GetConfig(PP_Resource image_capture, PP_Resource* config, struct PP_CompletionCallback* callback) {
|
| - const struct PPB_ImageCapture_Private_0_1 *iface = Pnacl_WrapperInfo_PPB_ImageCapture_Private_0_1.real_iface;
|
| - return iface->GetConfig(image_capture, config, *callback);
|
| -}
|
| -
|
| static int32_t Pnacl_M39_PPB_ImageCapture_Private_GetCameraCapabilities(PP_Resource image_capture, PP_Resource* capabilities, struct PP_CompletionCallback* callback) {
|
| const struct PPB_ImageCapture_Private_0_1 *iface = Pnacl_WrapperInfo_PPB_ImageCapture_Private_0_1.real_iface;
|
| return iface->GetCameraCapabilities(image_capture, capabilities, *callback);
|
| }
|
|
|
| -static int32_t Pnacl_M39_PPB_ImageCapture_Private_CaptureStillImage(PP_Resource image_capture, PPB_ImageCapture_Private_ShutterCallback shutter_callback, PPB_ImageCapture_Private_PreviewCallback preview_callback, PPB_ImageCapture_Private_JpegCallback jpeg_callback, int64_t* sequence_id) {
|
| - const struct PPB_ImageCapture_Private_0_1 *iface = Pnacl_WrapperInfo_PPB_ImageCapture_Private_0_1.real_iface;
|
| - return iface->CaptureStillImage(image_capture, shutter_callback, preview_callback, jpeg_callback, sequence_id);
|
| -}
|
| -
|
| /* End wrapper methods for PPB_ImageCapture_Private_0_1 */
|
|
|
| /* Not generating wrapper methods for PPB_InputEvent_Private_0_1 */
|
| @@ -5638,16 +5621,11 @@ static const struct PPB_HostResolver_Private_0_1 Pnacl_Wrappers_PPB_HostResolver
|
| .GetNetAddress = (PP_Bool (*)(PP_Resource host_resolver, uint32_t index, struct PP_NetAddress_Private* addr))&Pnacl_M19_PPB_HostResolver_Private_GetNetAddress
|
| };
|
|
|
| -/* Not generating wrapper interface for PPB_ImageCaptureConfig_Private_0_1 */
|
| -
|
| static const struct PPB_ImageCapture_Private_0_1 Pnacl_Wrappers_PPB_ImageCapture_Private_0_1 = {
|
| - .Create = (PP_Resource (*)(PP_Instance instance, struct PP_Var camera_source_id, PPB_ImageCapture_Private_ErrorCallback error_callback, void* user_data))&Pnacl_M39_PPB_ImageCapture_Private_Create,
|
| + .Create = (PP_Resource (*)(PP_Instance instance, struct PP_Var camera_source_id, void* user_data))&Pnacl_M39_PPB_ImageCapture_Private_Create,
|
| .IsImageCapture = (PP_Bool (*)(PP_Resource resource))&Pnacl_M39_PPB_ImageCapture_Private_IsImageCapture,
|
| .Close = (int32_t (*)(PP_Resource resource, struct PP_CompletionCallback callback))&Pnacl_M39_PPB_ImageCapture_Private_Close,
|
| - .SetConfig = (int32_t (*)(PP_Resource image_capture, PP_Resource config, struct PP_CompletionCallback callback))&Pnacl_M39_PPB_ImageCapture_Private_SetConfig,
|
| - .GetConfig = (int32_t (*)(PP_Resource image_capture, PP_Resource* config, struct PP_CompletionCallback callback))&Pnacl_M39_PPB_ImageCapture_Private_GetConfig,
|
| - .GetCameraCapabilities = (int32_t (*)(PP_Resource image_capture, PP_Resource* capabilities, struct PP_CompletionCallback callback))&Pnacl_M39_PPB_ImageCapture_Private_GetCameraCapabilities,
|
| - .CaptureStillImage = (int32_t (*)(PP_Resource image_capture, PPB_ImageCapture_Private_ShutterCallback shutter_callback, PPB_ImageCapture_Private_PreviewCallback preview_callback, PPB_ImageCapture_Private_JpegCallback jpeg_callback, int64_t* sequence_id))&Pnacl_M39_PPB_ImageCapture_Private_CaptureStillImage
|
| + .GetCameraCapabilities = (int32_t (*)(PP_Resource image_capture, PP_Resource* capabilities, struct PP_CompletionCallback callback))&Pnacl_M39_PPB_ImageCapture_Private_GetCameraCapabilities
|
| };
|
|
|
| /* Not generating wrapper interface for PPB_InputEvent_Private_0_1 */
|
|
|