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

src/shared/ppapi_proxy/untrusted/srpcgen/ppp_rpc.h

 // 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.
 
 #ifndef GEN_PPAPI_PROXY_PPP_RPC_H_
 #define GEN_PPAPI_PROXY_PPP_RPC_H_
 #ifndef __native_client__
 #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"
 class ObjectStubRpcServer {
  public:
   static void HasProperty(
       NaClSrpcRpc* rpc,
       NaClSrpcClosure* done,
       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);
@@ skipping 79 matching lines @@
   CompletionCallbackRpcServer(const CompletionCallbackRpcServer&);
   void operator=(const CompletionCallbackRpcServer);
 };  // class CompletionCallbackRpcServer
 
 class PppRpcServer {
  public:
   static void PPP_InitializeModule(
       NaClSrpcRpc* rpc,
       NaClSrpcClosure* done,
       int32_t pid,
-      int64_t module,
+      PP_Module module,
       NaClSrpcImcDescType upcall_channel_desc,
       char* service_description,
       int32_t* nacl_pid,
       int32_t* success);
   static void PPP_ShutdownModule(
       NaClSrpcRpc* rpc,
       NaClSrpcClosure* done);
   static void PPP_GetInterface(
       NaClSrpcRpc* rpc,
       NaClSrpcClosure* done,
       char* interface_name,
       int32_t* exports_interface_name);
 
  private:
   PppRpcServer();
   PppRpcServer(const PppRpcServer&);
   void operator=(const PppRpcServer);
 };  // class PppRpcServer
 
 class PppAudioDevRpcServer {
  public:
   static void PPP_Audio_Dev_StreamCreated(
       NaClSrpcRpc* rpc,
       NaClSrpcClosure* done,
-      int64_t instance,
+      PP_Instance instance,
       NaClSrpcImcDescType out_shm,
       int32_t out_shm_size,
       NaClSrpcImcDescType out_socket);
 
  private:
   PppAudioDevRpcServer();
   PppAudioDevRpcServer(const PppAudioDevRpcServer&);
   void operator=(const PppAudioDevRpcServer);
 };  // class PppAudioDevRpcServer
 
 class PppInstanceRpcServer {
  public:
   static void PPP_Instance_DidCreate(
       NaClSrpcRpc* rpc,
       NaClSrpcClosure* done,
-      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);
   static void PPP_Instance_DidDestroy(
       NaClSrpcRpc* rpc,
       NaClSrpcClosure* done,
-      int64_t instance);
+      PP_Instance instance);
   static void PPP_Instance_DidChangeView(
       NaClSrpcRpc* rpc,
       NaClSrpcClosure* done,
-      int64_t instance,
+      PP_Instance instance,
       nacl_abi_size_t position_bytes, int32_t* position,
       nacl_abi_size_t clip_bytes, int32_t* clip);
   static void PPP_Instance_DidChangeFocus(
       NaClSrpcRpc* rpc,
       NaClSrpcClosure* done,
-      int64_t instance,
+      PP_Instance instance,
       bool has_focus);
   static void PPP_Instance_HandleInputEvent(
       NaClSrpcRpc* rpc,
       NaClSrpcClosure* done,
-      int64_t instance,
+      PP_Instance instance,
       nacl_abi_size_t event_data_bytes, char* event_data,
       int32_t* success);
   static void PPP_Instance_HandleDocumentLoad(
       NaClSrpcRpc* rpc,
       NaClSrpcClosure* done,
-      int64_t instance,
-      int64_t url_loader,
+      PP_Instance instance,
+      PP_Resource url_loader,
       int32_t* success);
   static void PPP_Instance_GetInstanceObject(
       NaClSrpcRpc* rpc,
       NaClSrpcClosure* done,
-      int64_t instance,
+      PP_Instance instance,
       nacl_abi_size_t* capability_bytes, char* capability);
 
  private:
   PppInstanceRpcServer();
   PppInstanceRpcServer(const PppInstanceRpcServer&);
   void operator=(const PppInstanceRpcServer);
 };  // class PppInstanceRpcServer
 
 class PppRpcs {
  public:
   static NaClSrpcHandlerDesc srpc_methods[];
 };  // class PppRpcs
 
 #endif  // GEN_PPAPI_PROXY_PPP_RPC_H_