Chromium Code Reviews| Index: ppapi/proxy/ppapi_messages.h |
| diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h |
| index 275a550e282d8024ebb383ad5d9ec4114a9c7c99..fdcb2130b9a60fed90c919126806bc44e3d16997 100644 |
| --- a/ppapi/proxy/ppapi_messages.h |
| +++ b/ppapi/proxy/ppapi_messages.h |
| @@ -421,22 +421,6 @@ IPC_MESSAGE_ROUTED4(PpapiMsg_PPBAudio_NotifyAudioStreamCreated, |
| ppapi::proxy::SerializedHandle /* socket_handle */, |
| ppapi::proxy::SerializedHandle /* handle */) |
| -// PPB_FileIO. |
| -IPC_MESSAGE_ROUTED2(PpapiMsg_PPBFileIO_GeneralComplete, |
| - ppapi::HostResource /* file_io */, |
| - int32_t /* result */) |
| -IPC_MESSAGE_ROUTED2(PpapiMsg_PPBFileIO_OpenFileComplete, |
| - ppapi::HostResource /* file_io */, |
| - int32_t /* result */) |
| -IPC_MESSAGE_ROUTED3(PpapiMsg_PPBFileIO_QueryComplete, |
| - ppapi::HostResource /* file_io */, |
| - int32_t /* result */, |
| - PP_FileInfo /* info */) |
| -IPC_MESSAGE_ROUTED3(PpapiMsg_PPBFileIO_ReadComplete, |
| - ppapi::HostResource /* file_io */, |
| - int32_t /* result */, |
| - std::string /* data */) |
| - |
| // PPB_FileRef. |
| IPC_MESSAGE_ROUTED3( |
| PpapiMsg_PPBFileRef_CallbackComplete, |
| @@ -818,43 +802,6 @@ IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBCore_AddRefResource, |
| IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBCore_ReleaseResource, |
| ppapi::HostResource) |
| -// PPB_FileIO. |
| -IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBFileIO_Create, |
| - PP_Instance /* instance */, |
| - ppapi::HostResource /* result */) |
| -IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBFileIO_Open, |
| - ppapi::HostResource /* host_resource */, |
| - ppapi::HostResource /* file_ref_resource */, |
| - int32_t /* open_flags */) |
| -IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBFileIO_Close, |
| - ppapi::HostResource /* host_resource */) |
| -IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBFileIO_Query, |
| - ppapi::HostResource /* host_resource */) |
| -IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBFileIO_Touch, |
| - ppapi::HostResource /* host_resource */, |
| - PP_Time /* last_access_time */, |
| - PP_Time /* last_modified_time */) |
| -IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBFileIO_Read, |
| - ppapi::HostResource /* host_resource */, |
| - int64_t /* offset */, |
| - int32_t /* bytes_to_read */) |
| -IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBFileIO_Write, |
| - ppapi::HostResource /* host_resource */, |
| - int64_t /* offset */, |
| - std::string /* data */) |
| -IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBFileIO_SetLength, |
| - ppapi::HostResource /* host_resource */, |
| - int64_t /* length */) |
| -IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBFileIO_Flush, |
| - ppapi::HostResource /* host_resource */) |
| -IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBFileIO_WillWrite, |
| - ppapi::HostResource /* host_resource */, |
| - int64_t /* offset */, |
| - int32_t /* bytes_to_write */) |
| -IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBFileIO_WillSetLength, |
| - ppapi::HostResource /* host_resource */, |
| - int64_t /* length */) |
| - |
| // PPB_FileRef. |
| IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBFileRef_Create, |
| ppapi::HostResource /* file_system */, |
| @@ -1509,6 +1456,42 @@ IPC_MESSAGE_CONTROL4(PpapiHostMsg_FileChooser_Show, |
| IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FileChooser_ShowReply, |
| std::vector<ppapi::PPB_FileRef_CreateInfo> /* files */) |
| +// FileIO, Plugin -> Host. |
| +IPC_MESSAGE_CONTROL0(PpapiHostMsg_FileIO_Create) |
| +IPC_MESSAGE_CONTROL2(PpapiHostMsg_FileIO_Open, |
| + PP_Resource /* file_ref_resource */, |
| + int32_t /* open_flags */) |
| +IPC_MESSAGE_CONTROL0(PpapiHostMsg_FileIO_Close) |
| +IPC_MESSAGE_CONTROL0(PpapiHostMsg_FileIO_Query) |
| +IPC_MESSAGE_CONTROL2(PpapiHostMsg_FileIO_Touch, |
| + PP_Time /* last_access_time */, |
| + PP_Time /* last_modified_time */) |
| +IPC_MESSAGE_CONTROL2(PpapiHostMsg_FileIO_Read, |
| + int64_t /* offset */, |
| + int32_t /* bytes_to_read */) |
| +IPC_MESSAGE_CONTROL2(PpapiHostMsg_FileIO_Write, |
| + int64_t /* offset */, |
| + std::string /* data */) |
| +IPC_MESSAGE_CONTROL1(PpapiHostMsg_FileIO_SetLength, |
| + int64_t /* length */) |
| +IPC_MESSAGE_CONTROL0(PpapiHostMsg_FileIO_Flush) |
| +IPC_MESSAGE_CONTROL2(PpapiHostMsg_FileIO_WillWrite, |
| + int64_t /* offset */, |
| + int32_t /* bytes_to_write */) |
| +IPC_MESSAGE_CONTROL1(PpapiHostMsg_FileIO_WillSetLength, |
| + int64_t /* length */) |
| +IPC_MESSAGE_CONTROL0(PpapiHostMsg_FileIO_GetOSFileDescriptor) |
| + |
| +// FileIO, Host -> Plugin. |
|
raymes
2012/11/29 00:50:58
nit: I would just group these together in the same
victorhsieh
2012/11/29 06:34:55
Done.
|
| +IPC_MESSAGE_CONTROL0(PpapiPluginMsg_FileIO_GeneralComplete) |
| +IPC_MESSAGE_CONTROL0(PpapiPluginMsg_FileIO_OpenFileComplete) |
| +IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FileIO_QueryComplete, |
| + PP_FileInfo /* info */) |
| +IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FileIO_ReadComplete, |
| + std::string /* data */) |
| +IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FileIO_GetOSFileDescriptorReply, |
| + int32_t /* file descriptor */) |
| + |
| // Flash device ID. |
| IPC_MESSAGE_CONTROL0(PpapiHostMsg_FlashDeviceID_Create) |
| IPC_MESSAGE_CONTROL0(PpapiHostMsg_FlashDeviceID_GetDeviceID) |