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

src/shared/ppapi_proxy/untrusted/srpcgen/ppb_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_PPB_RPC_H_
 #define GEN_PPAPI_PROXY_PPB_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 ObjectStubRpcClient {
  public:
   static NaClSrpcError 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);
   static NaClSrpcError HasMethod(
@@ skipping 67 matching lines @@
  private:
   PpbRpcClient();
   PpbRpcClient(const PpbRpcClient&);
   void operator=(const PpbRpcClient);
 };  // class PpbRpcClient
 
 class PpbAudioDevRpcClient {
  public:
   static NaClSrpcError 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);
   static NaClSrpcError PPB_Audio_Dev_IsAudio(
       NaClSrpcChannel* channel,
-      int64_t resource,
+      PP_Resource resource,
       int32_t* out_bool);
   static NaClSrpcError PPB_Audio_Dev_GetCurrentConfig(
       NaClSrpcChannel* channel,
-      int64_t resource,
-      int64_t* out_resource);
+      PP_Resource resource,
+      PP_Resource* out_resource);
   static NaClSrpcError PPB_Audio_Dev_StopPlayback(
       NaClSrpcChannel* channel,
-      int64_t resource,
+      PP_Resource resource,
       int32_t* out_bool);
   static NaClSrpcError PPB_Audio_Dev_StartPlayback(
       NaClSrpcChannel* channel,
-      int64_t resource,
+      PP_Resource resource,
       int32_t* out_bool);
 
  private:
   PpbAudioDevRpcClient();
   PpbAudioDevRpcClient(const PpbAudioDevRpcClient&);
   void operator=(const PpbAudioDevRpcClient);
 };  // class PpbAudioDevRpcClient
 
 class PpbAudioConfigDevRpcClient {
  public:
   static NaClSrpcError 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);
   static NaClSrpcError PPB_AudioConfig_Dev_IsAudioConfig(
       NaClSrpcChannel* channel,
-      int64_t resource,
+      PP_Resource resource,
       int32_t* out_bool);
   static NaClSrpcError PPB_AudioConfig_Dev_RecommendSampleFrameCount(
       NaClSrpcChannel* channel,
       int32_t request,
       int32_t* sample_frame_count);
   static NaClSrpcError PPB_AudioConfig_Dev_GetSampleRate(
       NaClSrpcChannel* channel,
-      int64_t resource,
+      PP_Resource resource,
       int32_t* sample_rate);
   static NaClSrpcError PPB_AudioConfig_Dev_GetSampleFrameCount(
       NaClSrpcChannel* channel,
-      int64_t resource,
+      PP_Resource resource,
       int32_t* sample_frame_count);
 
  private:
   PpbAudioConfigDevRpcClient();
   PpbAudioConfigDevRpcClient(const PpbAudioConfigDevRpcClient&);
   void operator=(const PpbAudioConfigDevRpcClient);
 };  // class PpbAudioConfigDevRpcClient
 
 class PpbCoreRpcClient {
  public:
   static NaClSrpcError PPB_Core_AddRefResource(
       NaClSrpcChannel* channel,
-      int64_t resource);
+      PP_Resource resource);
   static NaClSrpcError PPB_Core_ReleaseResource(
       NaClSrpcChannel* channel,
-      int64_t resource);
+      PP_Resource resource);
   static NaClSrpcError ReleaseResourceMultipleTimes(
       NaClSrpcChannel* channel,
-      int64_t resource,
+      PP_Resource resource,
       int32_t count);
   static NaClSrpcError PPB_Core_GetTime(
       NaClSrpcChannel* channel,
       double* time);
 
  private:
   PpbCoreRpcClient();
   PpbCoreRpcClient(const PpbCoreRpcClient&);
   void operator=(const PpbCoreRpcClient);
 };  // class PpbCoreRpcClient
 
 class PpbGraphics2DRpcClient {
  public:
   static NaClSrpcError 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);
   static NaClSrpcError PPB_Graphics2D_IsGraphics2D(
       NaClSrpcChannel* channel,
-      int64_t resource,
+      PP_Resource resource,
       int32_t* success);
   static NaClSrpcError 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);
   static NaClSrpcError 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);
   static NaClSrpcError 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);
   static NaClSrpcError PPB_Graphics2D_ReplaceContents(
       NaClSrpcChannel* channel,
-      int64_t graphics_2d,
-      int64_t image);
+      PP_Resource graphics_2d,
+      PP_Resource image);
 
  private:
   PpbGraphics2DRpcClient();
   PpbGraphics2DRpcClient(const PpbGraphics2DRpcClient&);
   void operator=(const PpbGraphics2DRpcClient);
 };  // class PpbGraphics2DRpcClient
 
 class PpbImageDataRpcClient {
  public:
   static NaClSrpcError PPB_ImageData_GetNativeImageDataFormat(
       NaClSrpcChannel* channel,
       int32_t* format);
   static NaClSrpcError PPB_ImageData_IsImageDataFormatSupported(
       NaClSrpcChannel* channel,
       int32_t format,
       int32_t* success);
   static NaClSrpcError 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);
   static NaClSrpcError PPB_ImageData_IsImageData(
       NaClSrpcChannel* channel,
-      int64_t resource,
+      PP_Resource resource,
       int32_t* success);
   static NaClSrpcError PPB_ImageData_Describe(
       NaClSrpcChannel* channel,
-      int64_t resource,
+      PP_Resource resource,
       nacl_abi_size_t* desc_bytes, int32_t* desc,
       int32_t* success);
 
  private:
   PpbImageDataRpcClient();
   PpbImageDataRpcClient(const PpbImageDataRpcClient&);
   void operator=(const PpbImageDataRpcClient);
 };  // class PpbImageDataRpcClient
 
 class PpbInstanceRpcClient {
  public:
   static NaClSrpcError PPB_Instance_GetWindowObject(
       NaClSrpcChannel* channel,
-      int64_t instance,
+      PP_Instance instance,
       nacl_abi_size_t* window_bytes, char* window);
   static NaClSrpcError PPB_Instance_GetOwnerElementObject(
       NaClSrpcChannel* channel,
-      int64_t instance,
+      PP_Instance instance,
       nacl_abi_size_t* owner_bytes, char* owner);
   static NaClSrpcError PPB_Instance_BindGraphics(
       NaClSrpcChannel* channel,
-      int64_t instance,
-      int64_t graphics_device,
+      PP_Instance instance,
+      PP_Resource graphics_device,
       int32_t* success);
   static NaClSrpcError PPB_Instance_IsFullFrame(
       NaClSrpcChannel* channel,
-      int64_t instance,
+      PP_Instance instance,
       int32_t* is_full_frame);
   static NaClSrpcError 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);
 
  private:
   PpbInstanceRpcClient();
   PpbInstanceRpcClient(const PpbInstanceRpcClient&);
   void operator=(const PpbInstanceRpcClient);
 };  // class PpbInstanceRpcClient
@@ skipping 31 matching lines @@
  private:
   PpbURLRequestInfoRpcClient();
   PpbURLRequestInfoRpcClient(const PpbURLRequestInfoRpcClient&);
   void operator=(const PpbURLRequestInfoRpcClient);
 };  // class PpbURLRequestInfoRpcClient
 
 
 
 #endif  // GEN_PPAPI_PROXY_PPB_RPC_H_