Index: src/shared/ppapi_proxy/untrusted/srpcgen/ppb_rpc.h |
=================================================================== |
--- src/shared/ppapi_proxy/untrusted/srpcgen/ppb_rpc.h (revision 4040) |
+++ src/shared/ppapi_proxy/untrusted/srpcgen/ppb_rpc.h (working copy) |
@@ -14,6 +14,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" |
class ObjectStubRpcClient { |
public: |
static NaClSrpcError HasProperty( |
@@ -101,24 +104,24 @@ |
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: |
@@ -131,13 +134,13 @@ |
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, |
@@ -145,11 +148,11 @@ |
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: |
@@ -162,13 +165,13 @@ |
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, |
@@ -184,35 +187,35 @@ |
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(); |
@@ -231,18 +234,18 @@ |
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); |
@@ -256,24 +259,24 @@ |
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, |
@@ -289,27 +292,27 @@ |
public: |
static NaClSrpcError PPB_URLRequestInfo_Create( |
NaClSrpcChannel* channel, |
- int64_t module, |
- int64_t* resource); |
+ PP_Module module, |
+ PP_Resource* resource); |
static NaClSrpcError PPB_URLRequestInfo_IsURLRequestInfo( |
NaClSrpcChannel* channel, |
- int64_t resource, |
+ PP_Resource resource, |
int32_t* is_url_request_info); |
static NaClSrpcError PPB_URLRequestInfo_SetProperty( |
NaClSrpcChannel* channel, |
- int64_t request, |
+ PP_Resource request, |
int32_t property, |
nacl_abi_size_t value_bytes, char* value, |
int32_t* success); |
static NaClSrpcError PPB_URLRequestInfo_AppendDataToBody( |
NaClSrpcChannel* channel, |
- int64_t request, |
+ PP_Resource request, |
nacl_abi_size_t data_bytes, char* data, |
int32_t* success); |
static NaClSrpcError PPB_URLRequestInfo_AppendFileToBody( |
NaClSrpcChannel* channel, |
- int64_t request, |
- int64_t file_ref, |
+ PP_Resource request, |
+ PP_Resource file_ref, |
int64_t start_offset, |
int64_t number_of_bytes, |
double expected_last_modified_time, |
@@ -325,17 +328,17 @@ |
public: |
static NaClSrpcError PPB_URLResponseInfo_IsURLResponseInfo( |
NaClSrpcChannel* channel, |
- int64_t resource, |
+ PP_Resource resource, |
int32_t* is_url_response_info); |
static NaClSrpcError PPB_URLResponseInfo_GetProperty( |
NaClSrpcChannel* channel, |
- int64_t response, |
+ PP_Resource response, |
int32_t property, |
nacl_abi_size_t* value_bytes, char* value); |
static NaClSrpcError PPB_URLResponseInfo_GetBodyAsFileRef( |
NaClSrpcChannel* channel, |
- int64_t response, |
- int64_t* file_ref); |
+ PP_Resource response, |
+ PP_Resource* file_ref); |
private: |
PpbURLResponseInfoRpcClient(); |