| Index: ppapi/proxy/ppapi_messages.h
|
| diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
|
| index c332a9d73ecf0f878727e3f7a8a0c68760c34566..2a59a7a54652fac3a7032c178d2a145932bb5117 100644
|
| --- a/ppapi/proxy/ppapi_messages.h
|
| +++ b/ppapi/proxy/ppapi_messages.h
|
| @@ -3,16 +3,19 @@
|
| // found in the LICENSE file.
|
|
|
| // Multiply-included message header, no traditional include guard.
|
| +
|
| +#include <stdint.h>
|
| +
|
| #include <map>
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/files/file_path.h"
|
| #include "base/memory/shared_memory.h"
|
| #include "base/process/process.h"
|
| #include "base/strings/string16.h"
|
| #include "base/sync_socket.h"
|
| +#include "build/build_config.h"
|
| #include "gpu/command_buffer/common/command_buffer.h"
|
| #include "gpu/command_buffer/common/mailbox.h"
|
| #include "gpu/command_buffer/common/sync_token.h"
|
| @@ -542,60 +545,60 @@ IPC_MESSAGE_CONTROL1(PpapiMsg_SetNetworkState,
|
| // process will respond with PpapiHostMsg_GetSitesWithDataResult. This is used
|
| // for Flash.
|
| IPC_MESSAGE_CONTROL2(PpapiMsg_GetSitesWithData,
|
| - uint32 /* request_id */,
|
| + uint32_t /* request_id */,
|
| base::FilePath /* plugin_data_path */)
|
| IPC_MESSAGE_CONTROL2(PpapiHostMsg_GetSitesWithDataResult,
|
| - uint32 /* request_id */,
|
| + uint32_t /* request_id */,
|
| std::vector<std::string> /* sites */)
|
|
|
| // Instructs the plugin to clear data for the given site & time. The plugin
|
| // process will respond with PpapiHostMsg_ClearSiteDataResult. This is used
|
| // for Flash.
|
| IPC_MESSAGE_CONTROL5(PpapiMsg_ClearSiteData,
|
| - uint32 /* request_id */,
|
| + uint32_t /* request_id */,
|
| base::FilePath /* plugin_data_path */,
|
| std::string /* site */,
|
| - uint64 /* flags */,
|
| - uint64 /* max_age */)
|
| + uint64_t /* flags */,
|
| + uint64_t /* max_age */)
|
| IPC_MESSAGE_CONTROL2(PpapiHostMsg_ClearSiteDataResult,
|
| - uint32 /* request_id */,
|
| + uint32_t /* request_id */,
|
| bool /* success */)
|
|
|
| IPC_MESSAGE_CONTROL2(PpapiMsg_DeauthorizeContentLicenses,
|
| - uint32 /* request_id */,
|
| + uint32_t /* request_id */,
|
| base::FilePath /* plugin_data_path */)
|
| IPC_MESSAGE_CONTROL2(PpapiHostMsg_DeauthorizeContentLicensesResult,
|
| - uint32 /* request_id */,
|
| + uint32_t /* request_id */,
|
| bool /* success */)
|
|
|
| IPC_MESSAGE_CONTROL3(PpapiMsg_GetPermissionSettings,
|
| - uint32 /* request_id */,
|
| + uint32_t /* request_id */,
|
| base::FilePath /* plugin_data_path */,
|
| PP_Flash_BrowserOperations_SettingType /* setting_type */)
|
| IPC_MESSAGE_CONTROL4(
|
| PpapiHostMsg_GetPermissionSettingsResult,
|
| - uint32 /* request_id */,
|
| + uint32_t /* request_id */,
|
| bool /* success */,
|
| PP_Flash_BrowserOperations_Permission /* default_permission */,
|
| ppapi::FlashSiteSettings /* sites */)
|
|
|
| IPC_MESSAGE_CONTROL5(PpapiMsg_SetDefaultPermission,
|
| - uint32 /* request_id */,
|
| + uint32_t /* request_id */,
|
| base::FilePath /* plugin_data_path */,
|
| PP_Flash_BrowserOperations_SettingType /* setting_type */,
|
| PP_Flash_BrowserOperations_Permission /* permission */,
|
| bool /* clear_site_specific */)
|
| IPC_MESSAGE_CONTROL2(PpapiHostMsg_SetDefaultPermissionResult,
|
| - uint32 /* request_id */,
|
| + uint32_t /* request_id */,
|
| bool /* success */)
|
|
|
| IPC_MESSAGE_CONTROL4(PpapiMsg_SetSitePermission,
|
| - uint32 /* request_id */,
|
| + uint32_t /* request_id */,
|
| base::FilePath /* plugin_data_path */,
|
| PP_Flash_BrowserOperations_SettingType /* setting_type */,
|
| ppapi::FlashSiteSettings /* sites */)
|
| IPC_MESSAGE_CONTROL2(PpapiHostMsg_SetSitePermissionResult,
|
| - uint32 /* request_id */,
|
| + uint32_t /* request_id */,
|
| bool /* success */)
|
|
|
| // Broker Process.
|
| @@ -636,55 +639,55 @@ IPC_MESSAGE_ROUTED2(PpapiMsg_PPBInstance_MouseLockComplete,
|
|
|
| // PPP_Class.
|
| IPC_SYNC_MESSAGE_ROUTED3_2(PpapiMsg_PPPClass_HasProperty,
|
| - int64 /* ppp_class */,
|
| - int64 /* object */,
|
| + int64_t /* ppp_class */,
|
| + int64_t /* object */,
|
| ppapi::proxy::SerializedVar /* property */,
|
| ppapi::proxy::SerializedVar /* out_exception */,
|
| bool /* result */)
|
| IPC_SYNC_MESSAGE_ROUTED3_2(PpapiMsg_PPPClass_HasMethod,
|
| - int64 /* ppp_class */,
|
| - int64 /* object */,
|
| + int64_t /* ppp_class */,
|
| + int64_t /* object */,
|
| ppapi::proxy::SerializedVar /* method */,
|
| ppapi::proxy::SerializedVar /* out_exception */,
|
| bool /* result */)
|
| IPC_SYNC_MESSAGE_ROUTED3_2(PpapiMsg_PPPClass_GetProperty,
|
| - int64 /* ppp_class */,
|
| - int64 /* object */,
|
| + int64_t /* ppp_class */,
|
| + int64_t /* object */,
|
| ppapi::proxy::SerializedVar /* property */,
|
| ppapi::proxy::SerializedVar /* out_exception */,
|
| ppapi::proxy::SerializedVar /* result */)
|
| IPC_SYNC_MESSAGE_ROUTED2_2(PpapiMsg_PPPClass_EnumerateProperties,
|
| - int64 /* ppp_class */,
|
| - int64 /* object */,
|
| + int64_t /* ppp_class */,
|
| + int64_t /* object */,
|
| std::vector<ppapi::proxy::SerializedVar> /* props */,
|
| ppapi::proxy::SerializedVar /* out_exception */)
|
| IPC_SYNC_MESSAGE_ROUTED4_1(PpapiMsg_PPPClass_SetProperty,
|
| - int64 /* ppp_class */,
|
| - int64 /* object */,
|
| + int64_t /* ppp_class */,
|
| + int64_t /* object */,
|
| ppapi::proxy::SerializedVar /* name */,
|
| ppapi::proxy::SerializedVar /* value */,
|
| ppapi::proxy::SerializedVar /* out_exception */)
|
| IPC_SYNC_MESSAGE_ROUTED3_1(PpapiMsg_PPPClass_RemoveProperty,
|
| - int64 /* ppp_class */,
|
| - int64 /* object */,
|
| + int64_t /* ppp_class */,
|
| + int64_t /* object */,
|
| ppapi::proxy::SerializedVar /* property */,
|
| ppapi::proxy::SerializedVar /* out_exception */)
|
| IPC_SYNC_MESSAGE_ROUTED4_2(PpapiMsg_PPPClass_Call,
|
| - int64 /* ppp_class */,
|
| - int64 /* object */,
|
| + int64_t /* ppp_class */,
|
| + int64_t /* object */,
|
| ppapi::proxy::SerializedVar /* method_name */,
|
| std::vector<ppapi::proxy::SerializedVar> /* args */,
|
| ppapi::proxy::SerializedVar /* out_exception */,
|
| ppapi::proxy::SerializedVar /* result */)
|
| IPC_SYNC_MESSAGE_ROUTED3_2(PpapiMsg_PPPClass_Construct,
|
| - int64 /* ppp_class */,
|
| - int64 /* object */,
|
| + int64_t /* ppp_class */,
|
| + int64_t /* object */,
|
| std::vector<ppapi::proxy::SerializedVar> /* args */,
|
| ppapi::proxy::SerializedVar /* out_exception */,
|
| ppapi::proxy::SerializedVar /* result */)
|
| IPC_MESSAGE_ROUTED2(PpapiMsg_PPPClass_Deallocate,
|
| - int64 /* ppp_class */,
|
| - int64 /* object */)
|
| + int64_t /* ppp_class */,
|
| + int64_t /* object */)
|
|
|
| // PPP_Graphics3D_Dev.
|
| IPC_MESSAGE_ROUTED1(PpapiMsg_PPPGraphics3D_ContextLost,
|
| @@ -964,46 +967,46 @@ IPC_SYNC_MESSAGE_ROUTED3_4(PpapiHostMsg_PPBGraphics3D_Create,
|
| uint64_t /* command_buffer_id */)
|
| IPC_SYNC_MESSAGE_ROUTED2_0(PpapiHostMsg_PPBGraphics3D_SetGetBuffer,
|
| ppapi::HostResource /* context */,
|
| - int32 /* transfer_buffer_id */)
|
| + int32_t /* transfer_buffer_id */)
|
| IPC_SYNC_MESSAGE_ROUTED3_2(PpapiHostMsg_PPBGraphics3D_WaitForTokenInRange,
|
| ppapi::HostResource /* context */,
|
| - int32 /* start */,
|
| - int32 /* end */,
|
| + int32_t /* start */,
|
| + int32_t /* end */,
|
| gpu::CommandBuffer::State /* state */,
|
| bool /* success */)
|
| IPC_SYNC_MESSAGE_ROUTED3_2(PpapiHostMsg_PPBGraphics3D_WaitForGetOffsetInRange,
|
| ppapi::HostResource /* context */,
|
| - int32 /* start */,
|
| - int32 /* end */,
|
| + int32_t /* start */,
|
| + int32_t /* end */,
|
| gpu::CommandBuffer::State /* state */,
|
| bool /* success */)
|
| IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBGraphics3D_AsyncFlush,
|
| ppapi::HostResource /* context */,
|
| - int32 /* put_offset */)
|
| + int32_t /* put_offset */)
|
| IPC_SYNC_MESSAGE_ROUTED2_2(PpapiHostMsg_PPBGraphics3D_CreateTransferBuffer,
|
| ppapi::HostResource /* context */,
|
| - uint32 /* size */,
|
| - int32 /* id */,
|
| + uint32_t /* size */,
|
| + int32_t /* id */,
|
| ppapi::proxy::SerializedHandle /* transfer_buffer */)
|
| IPC_SYNC_MESSAGE_ROUTED2_0(PpapiHostMsg_PPBGraphics3D_DestroyTransferBuffer,
|
| ppapi::HostResource /* context */,
|
| - int32 /* id */)
|
| + int32_t /* id */)
|
| IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBGraphics3D_SwapBuffers,
|
| ppapi::HostResource /* graphics_3d */)
|
| IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBGraphics3D_InsertSyncPoint,
|
| ppapi::HostResource /* context */,
|
| - uint32 /* sync_point */)
|
| + uint32_t /* sync_point */)
|
| IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBGraphics3D_InsertFutureSyncPoint,
|
| ppapi::HostResource /* context */,
|
| - uint32 /* sync_point */)
|
| + uint32_t /* sync_point */)
|
| IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBGraphics3D_RetireSyncPoint,
|
| ppapi::HostResource /* context */,
|
| - uint32 /* sync_point */)
|
| + uint32_t /* sync_point */)
|
|
|
| // PPB_ImageData.
|
| IPC_SYNC_MESSAGE_ROUTED4_3(PpapiHostMsg_PPBImageData_CreatePlatform,
|
| PP_Instance /* instance */,
|
| - int32 /* format */,
|
| + int32_t /* format */,
|
| PP_Size /* size */,
|
| PP_Bool /* init_to_zero */,
|
| ppapi::HostResource /* result_resource */,
|
| @@ -1011,7 +1014,7 @@ IPC_SYNC_MESSAGE_ROUTED4_3(PpapiHostMsg_PPBImageData_CreatePlatform,
|
| ppapi::proxy::ImageHandle /* result */)
|
| IPC_SYNC_MESSAGE_ROUTED4_3(PpapiHostMsg_PPBImageData_CreateSimple,
|
| PP_Instance /* instance */,
|
| - int32 /* format */,
|
| + int32_t /* format */,
|
| PP_Size /* size */,
|
| PP_Bool /* init_to_zero */,
|
| ppapi::HostResource /* result_resource */,
|
| @@ -1113,9 +1116,8 @@ IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBInstance_UpdateSurroundingText,
|
|
|
| // PPB_Var.
|
| IPC_SYNC_MESSAGE_ROUTED1_0(PpapiHostMsg_PPBVar_AddRefObject,
|
| - int64 /* object_id */)
|
| -IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVar_ReleaseObject,
|
| - int64 /* object_id */)
|
| + int64_t /* object_id */)
|
| +IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVar_ReleaseObject, int64_t /* object_id */)
|
| IPC_SYNC_MESSAGE_ROUTED2_2(PpapiHostMsg_PPBVar_HasProperty,
|
| ppapi::proxy::SerializedVar /* object */,
|
| ppapi::proxy::SerializedVar /* property */,
|
| @@ -1158,13 +1160,13 @@ IPC_SYNC_MESSAGE_ROUTED2_2(PpapiHostMsg_PPBVar_Construct,
|
| ppapi::proxy::SerializedVar /* result */)
|
| IPC_SYNC_MESSAGE_ROUTED2_2(PpapiHostMsg_PPBVar_IsInstanceOfDeprecated,
|
| ppapi::proxy::SerializedVar /* var */,
|
| - int64 /* object_class */,
|
| - int64 /* object-data */,
|
| + int64_t /* object_class */,
|
| + int64_t /* object-data */,
|
| PP_Bool /* result */)
|
| IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBVar_CreateObjectDeprecated,
|
| PP_Instance /* instance */,
|
| - int64 /* object_class */,
|
| - int64 /* object_data */,
|
| + int64_t /* object_class */,
|
| + int64_t /* object_data */,
|
| ppapi::proxy::SerializedVar /* result */)
|
|
|
| #if !defined(OS_NACL) && !defined(NACL_WIN64)
|
| @@ -1257,7 +1259,7 @@ IPC_SYNC_MESSAGE_ROUTED3_1(
|
| PP_Bool /* result */)
|
| IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBTesting_GetLiveObjectsForInstance,
|
| PP_Instance /* instance */,
|
| - uint32 /* result */)
|
| + uint32_t /* result */)
|
| IPC_SYNC_MESSAGE_ROUTED1_0(PpapiHostMsg_PPBTesting_PostPowerSaverStatus,
|
| PP_Instance /* instance */)
|
| IPC_SYNC_MESSAGE_ROUTED1_0(
|
| @@ -1282,8 +1284,8 @@ IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBVideoDecoder_Create,
|
| IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBVideoDecoder_Decode,
|
| ppapi::HostResource /* video_decoder */,
|
| ppapi::HostResource /* bitstream buffer */,
|
| - int32 /* bitstream buffer id */,
|
| - uint32 /* size of buffer */)
|
| + int32_t /* bitstream buffer id */,
|
| + uint32_t /* size of buffer */)
|
| IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBVideoDecoder_AssignPictureBuffers,
|
| ppapi::HostResource /* video_decoder */,
|
| std::vector<PP_PictureBuffer_Dev> /* picture buffers */)
|
|
|