Convert srpc definitions from using int64 to using PP_Instance, PP_Module, an...

src/shared/ppapi_proxy/ppb_rpc_client.cc

 // Copyright (c) 2010 The Native Client Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
 //
 // Automatically generated code.  See srpcgen.py
 //
 // NaCl Simple Remote Procedure Call interface abstractions.
 
 #include "untrusted/srpcgen/ppb_rpc.h"
 #ifdef __native_client__
 #ifndef UNREFERENCED_PARAMETER
 #define UNREFERENCED_PARAMETER(P) do { (void) P; } while (0)
 #endif  // UNREFERENCED_PARAMETER
 #else
 #include "native_client/src/include/portability.h"
 #endif  // __native_client__
 #include "native_client/src/shared/srpc/nacl_srpc.h"
+#include "ppapi/c/pp_instance.h"
+#include "ppapi/c/pp_module.h"
+#include "ppapi/c/pp_resource.h"
 
 NaClSrpcError ObjectStubRpcClient::HasProperty(
     NaClSrpcChannel* channel,
     nacl_abi_size_t capability_bytes, char* capability,
     nacl_abi_size_t name_bytes, char* name,
     nacl_abi_size_t exception_in_bytes, char* exception_in,
     int32_t* success,
     nacl_abi_size_t* exception_bytes, char* exception)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
@@ skipping 173 matching lines @@
       channel,
       "PPB_GetInterface:s:i",
       interface_name,
       exports_interface_name
   );
   return retval;
 }
 
 NaClSrpcError PpbAudioDevRpcClient::PPB_Audio_Dev_Create(
     NaClSrpcChannel* channel,
-    int64_t instance,
-    int64_t config,
-    int64_t* out_resource)  {
+    PP_Instance instance,
+    PP_Resource config,
+    PP_Resource* out_resource)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_Audio_Dev_Create:ll:l",
       instance,
       config,
       out_resource
   );
   return retval;
 }
 
 NaClSrpcError PpbAudioDevRpcClient::PPB_Audio_Dev_IsAudio(
     NaClSrpcChannel* channel,
-    int64_t resource,
+    PP_Resource resource,
     int32_t* out_bool)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_Audio_Dev_IsAudio:l:i",
       resource,
       out_bool
   );
   return retval;
 }
 
 NaClSrpcError PpbAudioDevRpcClient::PPB_Audio_Dev_GetCurrentConfig(
     NaClSrpcChannel* channel,
-    int64_t resource,
-    int64_t* out_resource)  {
+    PP_Resource resource,
+    PP_Resource* out_resource)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_Audio_Dev_GetCurrentConfig:l:l",
       resource,
       out_resource
   );
   return retval;
 }
 
 NaClSrpcError PpbAudioDevRpcClient::PPB_Audio_Dev_StopPlayback(
     NaClSrpcChannel* channel,
-    int64_t resource,
+    PP_Resource resource,
     int32_t* out_bool)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_Audio_Dev_StopPlayback:l:i",
       resource,
       out_bool
   );
   return retval;
 }
 
 NaClSrpcError PpbAudioDevRpcClient::PPB_Audio_Dev_StartPlayback(
     NaClSrpcChannel* channel,
-    int64_t resource,
+    PP_Resource resource,
     int32_t* out_bool)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_Audio_Dev_StartPlayback:l:i",
       resource,
       out_bool
   );
   return retval;
 }
 
 NaClSrpcError PpbAudioConfigDevRpcClient::PPB_AudioConfig_Dev_CreateStereo16Bit(
     NaClSrpcChannel* channel,
-    int64_t module,
+    PP_Module module,
     int32_t sample_rate,
     int32_t sample_frame_count,
-    int64_t* resource)  {
+    PP_Resource* resource)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_AudioConfig_Dev_CreateStereo16Bit:lii:l",
       module,
       sample_rate,
       sample_frame_count,
       resource
   );
   return retval;
 }
 
 NaClSrpcError PpbAudioConfigDevRpcClient::PPB_AudioConfig_Dev_IsAudioConfig(
     NaClSrpcChannel* channel,
-    int64_t resource,
+    PP_Resource resource,
     int32_t* out_bool)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_AudioConfig_Dev_IsAudioConfig:l:i",
       resource,
       out_bool
   );
   return retval;
 }
 
 NaClSrpcError PpbAudioConfigDevRpcClient::PPB_AudioConfig_Dev_RecommendSampleFrameCount(
     NaClSrpcChannel* channel,
     int32_t request,
     int32_t* sample_frame_count)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_AudioConfig_Dev_RecommendSampleFrameCount:i:i",
       request,
       sample_frame_count
   );
   return retval;
 }
 
 NaClSrpcError PpbAudioConfigDevRpcClient::PPB_AudioConfig_Dev_GetSampleRate(
     NaClSrpcChannel* channel,
-    int64_t resource,
+    PP_Resource resource,
     int32_t* sample_rate)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_AudioConfig_Dev_GetSampleRate:l:i",
       resource,
       sample_rate
   );
   return retval;
 }
 
 NaClSrpcError PpbAudioConfigDevRpcClient::PPB_AudioConfig_Dev_GetSampleFrameCount(
     NaClSrpcChannel* channel,
-    int64_t resource,
+    PP_Resource resource,
     int32_t* sample_frame_count)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_AudioConfig_Dev_GetSampleFrameCount:l:i",
       resource,
       sample_frame_count
   );
   return retval;
 }
 
 NaClSrpcError PpbCoreRpcClient::PPB_Core_AddRefResource(
     NaClSrpcChannel* channel,
-    int64_t resource)  {
+    PP_Resource resource)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_Core_AddRefResource:l:",
       resource
   );
   return retval;
 }
 
 NaClSrpcError PpbCoreRpcClient::PPB_Core_ReleaseResource(
     NaClSrpcChannel* channel,
-    int64_t resource)  {
+    PP_Resource resource)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_Core_ReleaseResource:l:",
       resource
   );
   return retval;
 }
 
 NaClSrpcError PpbCoreRpcClient::ReleaseResourceMultipleTimes(
     NaClSrpcChannel* channel,
-    int64_t resource,
+    PP_Resource resource,
     int32_t count)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "ReleaseResourceMultipleTimes:li:",
       resource,
       count
   );
   return retval;
 }
 
 NaClSrpcError PpbCoreRpcClient::PPB_Core_GetTime(
     NaClSrpcChannel* channel,
     double* time)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_Core_GetTime::d",
       time
   );
   return retval;
 }
 
 NaClSrpcError PpbGraphics2DRpcClient::PPB_Graphics2D_Create(
     NaClSrpcChannel* channel,
-    int64_t module,
+    PP_Module module,
     nacl_abi_size_t size_bytes, int32_t* size,
     int32_t is_always_opaque,
-    int64_t* resource)  {
+    PP_Resource* resource)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_Graphics2D_Create:lIi:l",
       module,
       size_bytes, size,
       is_always_opaque,
       resource
   );
   return retval;
 }
 
 NaClSrpcError PpbGraphics2DRpcClient::PPB_Graphics2D_IsGraphics2D(
     NaClSrpcChannel* channel,
-    int64_t resource,
+    PP_Resource resource,
     int32_t* success)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_Graphics2D_IsGraphics2D:l:i",
       resource,
       success
   );
   return retval;
 }
 
 NaClSrpcError PpbGraphics2DRpcClient::PPB_Graphics2D_Describe(
     NaClSrpcChannel* channel,
-    int64_t graphics_2d,
+    PP_Resource graphics_2d,
     nacl_abi_size_t* size_bytes, int32_t* size,
     int32_t* is_always_opaque,
     int32_t* success)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_Graphics2D_Describe:l:Iii",
       graphics_2d,
       size_bytes, size,
       is_always_opaque,
       success
   );
   return retval;
 }
 
 NaClSrpcError PpbGraphics2DRpcClient::PPB_Graphics2D_PaintImageData(
     NaClSrpcChannel* channel,
-    int64_t graphics_2d,
-    int64_t image,
+    PP_Resource graphics_2d,
+    PP_Resource image,
     nacl_abi_size_t top_left_bytes, int32_t* top_left,
     nacl_abi_size_t src_rect_bytes, int32_t* src_rect)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_Graphics2D_PaintImageData:llII:",
       graphics_2d,
       image,
       top_left_bytes, top_left,
       src_rect_bytes, src_rect
   );
   return retval;
 }
 
 NaClSrpcError PpbGraphics2DRpcClient::PPB_Graphics2D_Scroll(
     NaClSrpcChannel* channel,
-    int64_t graphics_2d,
+    PP_Resource graphics_2d,
     nacl_abi_size_t clip_rect_bytes, int32_t* clip_rect,
     nacl_abi_size_t amount_bytes, int32_t* amount)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_Graphics2D_Scroll:lII:",
       graphics_2d,
       clip_rect_bytes, clip_rect,
       amount_bytes, amount
   );
   return retval;
 }
 
 NaClSrpcError PpbGraphics2DRpcClient::PPB_Graphics2D_ReplaceContents(
     NaClSrpcChannel* channel,
-    int64_t graphics_2d,
-    int64_t image)  {
+    PP_Resource graphics_2d,
+    PP_Resource image)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_Graphics2D_ReplaceContents:ll:",
       graphics_2d,
       image
   );
   return retval;
 }
 
@@ skipping 18 matching lines @@
       channel,
       "PPB_ImageData_IsImageDataFormatSupported:i:i",
       format,
       success
   );
   return retval;
 }
 
 NaClSrpcError PpbImageDataRpcClient::PPB_ImageData_Create(
     NaClSrpcChannel* channel,
-    int64_t module,
+    PP_Module module,
     int32_t format,
     nacl_abi_size_t size_bytes, int32_t* size,
     int32_t init_to_zero,
-    int64_t* resource)  {
+    PP_Resource* resource)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_ImageData_Create:liIi:l",
       module,
       format,
       size_bytes, size,
       init_to_zero,
       resource
   );
   return retval;
 }
 
 NaClSrpcError PpbImageDataRpcClient::PPB_ImageData_IsImageData(
     NaClSrpcChannel* channel,
-    int64_t resource,
+    PP_Resource resource,
     int32_t* success)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_ImageData_IsImageData:l:i",
       resource,
       success
   );
   return retval;
 }
 
 NaClSrpcError PpbImageDataRpcClient::PPB_ImageData_Describe(
     NaClSrpcChannel* channel,
-    int64_t resource,
+    PP_Resource resource,
     nacl_abi_size_t* desc_bytes, int32_t* desc,
     int32_t* success)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_ImageData_Describe:l:Ii",
       resource,
       desc_bytes, desc,
       success
   );
   return retval;
 }
 
 NaClSrpcError PpbInstanceRpcClient::PPB_Instance_GetWindowObject(
     NaClSrpcChannel* channel,
-    int64_t instance,
+    PP_Instance instance,
     nacl_abi_size_t* window_bytes, char* window)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_Instance_GetWindowObject:l:C",
       instance,
       window_bytes, window
   );
   return retval;
 }
 
 NaClSrpcError PpbInstanceRpcClient::PPB_Instance_GetOwnerElementObject(
     NaClSrpcChannel* channel,
-    int64_t instance,
+    PP_Instance instance,
     nacl_abi_size_t* owner_bytes, char* owner)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_Instance_GetOwnerElementObject:l:C",
       instance,
       owner_bytes, owner
   );
   return retval;
 }
 
 NaClSrpcError PpbInstanceRpcClient::PPB_Instance_BindGraphics(
     NaClSrpcChannel* channel,
-    int64_t instance,
-    int64_t graphics_device,
+    PP_Instance instance,
+    PP_Resource graphics_device,
     int32_t* success)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_Instance_BindGraphics:ll:i",
       instance,
       graphics_device,
       success
   );
   return retval;
 }
 
 NaClSrpcError PpbInstanceRpcClient::PPB_Instance_IsFullFrame(
     NaClSrpcChannel* channel,
-    int64_t instance,
+    PP_Instance instance,
     int32_t* is_full_frame)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_Instance_IsFullFrame:l:i",
       instance,
       is_full_frame
   );
   return retval;
 }
 
 NaClSrpcError PpbInstanceRpcClient::PPB_Instance_ExecuteScript(
     NaClSrpcChannel* channel,
-    int64_t instance,
+    PP_Instance instance,
     nacl_abi_size_t script_bytes, char* script,
     nacl_abi_size_t exception_in_bytes, char* exception_in,
     nacl_abi_size_t* result_bytes, char* result,
     nacl_abi_size_t* exception_bytes, char* exception)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPB_Instance_ExecuteScript:lCC:CC",
       instance,
       script_bytes, script,
@@ skipping 82 matching lines @@
       file_ref,
       start_offset,
       number_of_bytes,
       expected_last_modified_time,
       success
   );
   return retval;
 }