Index: src/shared/ppapi_proxy/ppb_rpc_client.cc |
=================================================================== |
--- src/shared/ppapi_proxy/ppb_rpc_client.cc (revision 4034) |
+++ src/shared/ppapi_proxy/ppb_rpc_client.cc (working copy) |
@@ -17,6 +17,9 @@ |
#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, |
@@ -210,9 +213,9 @@ |
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, |
@@ -226,7 +229,7 @@ |
NaClSrpcError PpbAudioDevRpcClient::PPB_Audio_Dev_IsAudio( |
NaClSrpcChannel* channel, |
- int64_t resource, |
+ PP_Resource resource, |
int32_t* out_bool) { |
NaClSrpcError retval; |
retval = NaClSrpcInvokeBySignature( |
@@ -240,8 +243,8 @@ |
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, |
@@ -254,7 +257,7 @@ |
NaClSrpcError PpbAudioDevRpcClient::PPB_Audio_Dev_StopPlayback( |
NaClSrpcChannel* channel, |
- int64_t resource, |
+ PP_Resource resource, |
int32_t* out_bool) { |
NaClSrpcError retval; |
retval = NaClSrpcInvokeBySignature( |
@@ -268,7 +271,7 @@ |
NaClSrpcError PpbAudioDevRpcClient::PPB_Audio_Dev_StartPlayback( |
NaClSrpcChannel* channel, |
- int64_t resource, |
+ PP_Resource resource, |
int32_t* out_bool) { |
NaClSrpcError retval; |
retval = NaClSrpcInvokeBySignature( |
@@ -282,10 +285,10 @@ |
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, |
@@ -300,7 +303,7 @@ |
NaClSrpcError PpbAudioConfigDevRpcClient::PPB_AudioConfig_Dev_IsAudioConfig( |
NaClSrpcChannel* channel, |
- int64_t resource, |
+ PP_Resource resource, |
int32_t* out_bool) { |
NaClSrpcError retval; |
retval = NaClSrpcInvokeBySignature( |
@@ -328,7 +331,7 @@ |
NaClSrpcError PpbAudioConfigDevRpcClient::PPB_AudioConfig_Dev_GetSampleRate( |
NaClSrpcChannel* channel, |
- int64_t resource, |
+ PP_Resource resource, |
int32_t* sample_rate) { |
NaClSrpcError retval; |
retval = NaClSrpcInvokeBySignature( |
@@ -342,7 +345,7 @@ |
NaClSrpcError PpbAudioConfigDevRpcClient::PPB_AudioConfig_Dev_GetSampleFrameCount( |
NaClSrpcChannel* channel, |
- int64_t resource, |
+ PP_Resource resource, |
int32_t* sample_frame_count) { |
NaClSrpcError retval; |
retval = NaClSrpcInvokeBySignature( |
@@ -356,7 +359,7 @@ |
NaClSrpcError PpbCoreRpcClient::PPB_Core_AddRefResource( |
NaClSrpcChannel* channel, |
- int64_t resource) { |
+ PP_Resource resource) { |
NaClSrpcError retval; |
retval = NaClSrpcInvokeBySignature( |
channel, |
@@ -368,7 +371,7 @@ |
NaClSrpcError PpbCoreRpcClient::PPB_Core_ReleaseResource( |
NaClSrpcChannel* channel, |
- int64_t resource) { |
+ PP_Resource resource) { |
NaClSrpcError retval; |
retval = NaClSrpcInvokeBySignature( |
channel, |
@@ -380,7 +383,7 @@ |
NaClSrpcError PpbCoreRpcClient::ReleaseResourceMultipleTimes( |
NaClSrpcChannel* channel, |
- int64_t resource, |
+ PP_Resource resource, |
int32_t count) { |
NaClSrpcError retval; |
retval = NaClSrpcInvokeBySignature( |
@@ -406,10 +409,10 @@ |
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, |
@@ -424,7 +427,7 @@ |
NaClSrpcError PpbGraphics2DRpcClient::PPB_Graphics2D_IsGraphics2D( |
NaClSrpcChannel* channel, |
- int64_t resource, |
+ PP_Resource resource, |
int32_t* success) { |
NaClSrpcError retval; |
retval = NaClSrpcInvokeBySignature( |
@@ -438,7 +441,7 @@ |
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) { |
@@ -456,8 +459,8 @@ |
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; |
@@ -474,7 +477,7 @@ |
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; |
@@ -490,8 +493,8 @@ |
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, |
@@ -530,11 +533,11 @@ |
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, |
@@ -550,7 +553,7 @@ |
NaClSrpcError PpbImageDataRpcClient::PPB_ImageData_IsImageData( |
NaClSrpcChannel* channel, |
- int64_t resource, |
+ PP_Resource resource, |
int32_t* success) { |
NaClSrpcError retval; |
retval = NaClSrpcInvokeBySignature( |
@@ -564,7 +567,7 @@ |
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; |
@@ -580,7 +583,7 @@ |
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( |
@@ -594,7 +597,7 @@ |
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( |
@@ -608,8 +611,8 @@ |
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( |
@@ -624,7 +627,7 @@ |
NaClSrpcError PpbInstanceRpcClient::PPB_Instance_IsFullFrame( |
NaClSrpcChannel* channel, |
- int64_t instance, |
+ PP_Instance instance, |
int32_t* is_full_frame) { |
NaClSrpcError retval; |
retval = NaClSrpcInvokeBySignature( |
@@ -638,7 +641,7 @@ |
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, |