| Index: src/shared/ppapi_proxy/trusted/srpcgen/ppb_rpc.h
|
| ===================================================================
|
| --- src/shared/ppapi_proxy/trusted/srpcgen/ppb_rpc.h (revision 4034)
|
| +++ src/shared/ppapi_proxy/trusted/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 ObjectStubRpcServer {
|
| public:
|
| static void HasProperty(
|
| @@ -112,28 +115,28 @@
|
| static void PPB_Audio_Dev_Create(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - int64_t instance,
|
| - int64_t config,
|
| - int64_t* out_resource);
|
| + PP_Instance instance,
|
| + PP_Resource config,
|
| + PP_Resource* out_resource);
|
| static void PPB_Audio_Dev_IsAudio(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - int64_t resource,
|
| + PP_Resource resource,
|
| int32_t* out_bool);
|
| static void PPB_Audio_Dev_GetCurrentConfig(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - int64_t resource,
|
| - int64_t* out_resource);
|
| + PP_Resource resource,
|
| + PP_Resource* out_resource);
|
| static void PPB_Audio_Dev_StopPlayback(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - int64_t resource,
|
| + PP_Resource resource,
|
| int32_t* out_bool);
|
| static void PPB_Audio_Dev_StartPlayback(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - int64_t resource,
|
| + PP_Resource resource,
|
| int32_t* out_bool);
|
|
|
| private:
|
| @@ -147,14 +150,14 @@
|
| static void PPB_AudioConfig_Dev_CreateStereo16Bit(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - int64_t module,
|
| + PP_Module module,
|
| int32_t sample_rate,
|
| int32_t sample_frame_count,
|
| - int64_t* resource);
|
| + PP_Resource* resource);
|
| static void PPB_AudioConfig_Dev_IsAudioConfig(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - int64_t resource,
|
| + PP_Resource resource,
|
| int32_t* out_bool);
|
| static void PPB_AudioConfig_Dev_RecommendSampleFrameCount(
|
| NaClSrpcRpc* rpc,
|
| @@ -164,12 +167,12 @@
|
| static void PPB_AudioConfig_Dev_GetSampleRate(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - int64_t resource,
|
| + PP_Resource resource,
|
| int32_t* sample_rate);
|
| static void PPB_AudioConfig_Dev_GetSampleFrameCount(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - int64_t resource,
|
| + PP_Resource resource,
|
| int32_t* sample_frame_count);
|
|
|
| private:
|
| @@ -183,15 +186,15 @@
|
| static void PPB_Core_AddRefResource(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - int64_t resource);
|
| + PP_Resource resource);
|
| static void PPB_Core_ReleaseResource(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - int64_t resource);
|
| + PP_Resource resource);
|
| static void ReleaseResourceMultipleTimes(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - int64_t resource,
|
| + PP_Resource resource,
|
| int32_t count);
|
| static void PPB_Core_GetTime(
|
| NaClSrpcRpc* rpc,
|
| @@ -209,40 +212,40 @@
|
| static void PPB_Graphics2D_Create(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - 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 void PPB_Graphics2D_IsGraphics2D(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - int64_t resource,
|
| + PP_Resource resource,
|
| int32_t* success);
|
| static void PPB_Graphics2D_Describe(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - 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 void PPB_Graphics2D_PaintImageData(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - 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 void PPB_Graphics2D_Scroll(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - 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 void PPB_Graphics2D_ReplaceContents(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - int64_t graphics_2d,
|
| - int64_t image);
|
| + PP_Resource graphics_2d,
|
| + PP_Resource image);
|
|
|
| private:
|
| PpbGraphics2DRpcServer();
|
| @@ -264,20 +267,20 @@
|
| static void PPB_ImageData_Create(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - 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 void PPB_ImageData_IsImageData(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - int64_t resource,
|
| + PP_Resource resource,
|
| int32_t* success);
|
| static void PPB_ImageData_Describe(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - int64_t resource,
|
| + PP_Resource resource,
|
| nacl_abi_size_t* desc_bytes, int32_t* desc,
|
| int32_t* success);
|
|
|
| @@ -292,28 +295,28 @@
|
| static void PPB_Instance_GetWindowObject(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - int64_t instance,
|
| + PP_Instance instance,
|
| nacl_abi_size_t* window_bytes, char* window);
|
| static void PPB_Instance_GetOwnerElementObject(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - int64_t instance,
|
| + PP_Instance instance,
|
| nacl_abi_size_t* owner_bytes, char* owner);
|
| static void PPB_Instance_BindGraphics(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - int64_t instance,
|
| - int64_t graphics_device,
|
| + PP_Instance instance,
|
| + PP_Resource graphics_device,
|
| int32_t* success);
|
| static void PPB_Instance_IsFullFrame(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - int64_t instance,
|
| + PP_Instance instance,
|
| int32_t* is_full_frame);
|
| static void PPB_Instance_ExecuteScript(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| - 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,
|
|
|