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

src/shared/ppapi_proxy/ppp_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 "trusted/srpcgen/ppp_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 174 matching lines @@
       "InvokeCompletionCallback:ii:",
       callback_id,
       result
   );
   return retval;
 }
 
 NaClSrpcError PppRpcClient::PPP_InitializeModule(
     NaClSrpcChannel* channel,
     int32_t pid,
-    int64_t module,
+    PP_Module module,
     NaClSrpcImcDescType upcall_channel_desc,
     char* service_description,
     int32_t* nacl_pid,
     int32_t* success)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPP_InitializeModule:ilhs:ii",
       pid,
       module,
@@ skipping 24 matching lines @@
       channel,
       "PPP_GetInterface:s:i",
       interface_name,
       exports_interface_name
   );
   return retval;
 }
 
 NaClSrpcError PppAudioDevRpcClient::PPP_Audio_Dev_StreamCreated(
     NaClSrpcChannel* channel,
-    int64_t instance,
+    PP_Instance instance,
     NaClSrpcImcDescType out_shm,
     int32_t out_shm_size,
     NaClSrpcImcDescType out_socket)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPP_Audio_Dev_StreamCreated:lhih:",
       instance,
       out_shm,
       out_shm_size,
       out_socket
   );
   return retval;
 }
 
 NaClSrpcError PppInstanceRpcClient::PPP_Instance_DidCreate(
     NaClSrpcChannel* channel,
-    int64_t instance,
+    PP_Instance instance,
     int32_t argc,
     nacl_abi_size_t argn_bytes, char* argn,
     nacl_abi_size_t argv_bytes, char* argv,
     int32_t* success)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPP_Instance_DidCreate:liCC:i",
       instance,
       argc,
       argn_bytes, argn,
       argv_bytes, argv,
       success
   );
   return retval;
 }
 
 NaClSrpcError PppInstanceRpcClient::PPP_Instance_DidDestroy(
     NaClSrpcChannel* channel,
-    int64_t instance)  {
+    PP_Instance instance)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPP_Instance_DidDestroy:l:",
       instance
   );
   return retval;
 }
 
 NaClSrpcError PppInstanceRpcClient::PPP_Instance_DidChangeView(
     NaClSrpcChannel* channel,
-    int64_t instance,
+    PP_Instance instance,
     nacl_abi_size_t position_bytes, int32_t* position,
     nacl_abi_size_t clip_bytes, int32_t* clip)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPP_Instance_DidChangeView:lII:",
       instance,
       position_bytes, position,
       clip_bytes, clip
   );
   return retval;
 }
 
 NaClSrpcError PppInstanceRpcClient::PPP_Instance_DidChangeFocus(
     NaClSrpcChannel* channel,
-    int64_t instance,
+    PP_Instance instance,
     bool has_focus)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPP_Instance_DidChangeFocus:lb:",
       instance,
       has_focus
   );
   return retval;
 }
 
 NaClSrpcError PppInstanceRpcClient::PPP_Instance_HandleInputEvent(
     NaClSrpcChannel* channel,
-    int64_t instance,
+    PP_Instance instance,
     nacl_abi_size_t event_data_bytes, char* event_data,
     int32_t* success)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPP_Instance_HandleInputEvent:lC:i",
       instance,
       event_data_bytes, event_data,
       success
   );
   return retval;
 }
 
 NaClSrpcError PppInstanceRpcClient::PPP_Instance_HandleDocumentLoad(
     NaClSrpcChannel* channel,
-    int64_t instance,
-    int64_t url_loader,
+    PP_Instance instance,
+    PP_Resource url_loader,
     int32_t* success)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPP_Instance_HandleDocumentLoad:ll:i",
       instance,
       url_loader,
       success
   );
   return retval;
 }
 
 NaClSrpcError PppInstanceRpcClient::PPP_Instance_GetInstanceObject(
     NaClSrpcChannel* channel,
-    int64_t instance,
+    PP_Instance instance,
     nacl_abi_size_t* capability_bytes, char* capability)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
       "PPP_Instance_GetInstanceObject:l:C",
       instance,
       capability_bytes, capability
   );
   return retval;
 }