Index: ppapi/proxy/ppapi_messages.h |
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h |
index 361c19e3b24f487939be8242f7794a08d1bf9248..42daa0939b258995456b30d0b508fc0a94a3ea7a 100644 |
--- a/ppapi/proxy/ppapi_messages.h |
+++ b/ppapi/proxy/ppapi_messages.h |
@@ -1419,21 +1419,6 @@ IPC_MESSAGE_ROUTED0(PpapiHostMsg_PPBFlash_UpdateActivity) |
IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBFlash_GetDeviceID, |
PP_Instance /* instance */, |
ppapi::proxy::SerializedVar /* id */) |
-IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBFlash_IsClipboardFormatAvailable, |
- PP_Instance /* instance */, |
- int /* clipboard_type */, |
- int /* format */, |
- bool /* result */) |
-IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBFlash_ReadClipboardData, |
- PP_Instance /* instance */, |
- int /* clipboard_type */, |
- int /* format */, |
- ppapi::proxy::SerializedVar /* result */) |
-IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBFlash_WriteClipboardData, |
- PP_Instance /* instance */, |
- int /* clipboard_type */, |
- std::vector<int> /* formats */, |
- std::vector<ppapi::proxy::SerializedVar> /* data */) |
IPC_SYNC_MESSAGE_ROUTED3_2(PpapiHostMsg_PPBFlash_OpenFileRef, |
PP_Instance /* instance */, |
ppapi::HostResource /* file_ref */, |
@@ -1734,4 +1719,23 @@ IPC_MESSAGE_CONTROL1(PpapiHostMsg_Flash_EnumerateVideoCaptureDevices, |
ppapi::HostResource /* video_capture */) |
IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Flash_EnumerateVideoCaptureDevicesReply, |
std::vector<ppapi::DeviceRefData> /* devices */) |
+ |
+// Flash clipboard. |
yzshen1
2012/10/29 16:55:46
nit, optional: sort according to the name (Flash c
raymes
2012/10/29 18:44:58
Done.
|
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_FlashClipboard_Create) |
+IPC_MESSAGE_CONTROL1(PpapiHostMsg_FlashClipboard_RegisterCustomFormat, |
+ std::string /* format_name */) |
+IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FlashClipboard_RegisterCustomFormatReply, |
+ uint32_t /* format */) |
+IPC_MESSAGE_CONTROL2(PpapiHostMsg_FlashClipboard_IsFormatAvailable, |
+ uint32_t /* clipboard_type */, |
+ uint32_t /* format */) |
+IPC_MESSAGE_CONTROL2(PpapiHostMsg_FlashClipboard_ReadData, |
+ uint32_t /* clipboard_type */, |
+ uint32_t /* format */) |
+IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FlashClipboard_ReadDataReply, |
+ std::string /* result */) |
+IPC_MESSAGE_CONTROL3(PpapiHostMsg_FlashClipboard_WriteData, |
+ uint32_t /* clipboard_type */, |
+ std::vector<uint32_t> /* formats */, |
+ std::vector<std::string> /* data */) |
#endif // !defined(OS_NACL) && !defined(NACL_WIN64) |