| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Multiply-included message header, no traditional include guard. | 5 // Multiply-included message header, no traditional include guard. |
| 6 #include <map> | 6 #include <map> |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 #include "ppapi/shared_impl/ppapi_preferences.h" | 66 #include "ppapi/shared_impl/ppapi_preferences.h" |
| 67 #include "ppapi/shared_impl/ppb_device_ref_shared.h" | 67 #include "ppapi/shared_impl/ppb_device_ref_shared.h" |
| 68 #include "ppapi/shared_impl/ppb_input_event_shared.h" | 68 #include "ppapi/shared_impl/ppb_input_event_shared.h" |
| 69 #include "ppapi/shared_impl/ppb_tcp_socket_shared.h" | 69 #include "ppapi/shared_impl/ppb_tcp_socket_shared.h" |
| 70 #include "ppapi/shared_impl/ppb_view_shared.h" | 70 #include "ppapi/shared_impl/ppb_view_shared.h" |
| 71 #include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h" | 71 #include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h" |
| 72 #include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h" | 72 #include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h" |
| 73 #include "ppapi/shared_impl/socket_option_data.h" | 73 #include "ppapi/shared_impl/socket_option_data.h" |
| 74 #include "ppapi/shared_impl/url_request_info_data.h" | 74 #include "ppapi/shared_impl/url_request_info_data.h" |
| 75 #include "ppapi/shared_impl/url_response_info_data.h" | 75 #include "ppapi/shared_impl/url_response_info_data.h" |
| 76 #include "ui/events/ipc/latency_info_param_traits.h" |
| 76 | 77 |
| 77 #undef IPC_MESSAGE_EXPORT | 78 #undef IPC_MESSAGE_EXPORT |
| 78 #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT | 79 #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT |
| 79 | 80 |
| 80 #define IPC_MESSAGE_START PpapiMsgStart | 81 #define IPC_MESSAGE_START PpapiMsgStart |
| 81 | 82 |
| 82 IPC_ENUM_TRAITS_MAX_VALUE(ppapi::TCPSocketVersion, | 83 IPC_ENUM_TRAITS_MAX_VALUE(ppapi::TCPSocketVersion, |
| 83 ppapi::TCP_SOCKET_VERSION_1_1_OR_ABOVE) | 84 ppapi::TCP_SOCKET_VERSION_1_1_OR_ABOVE) |
| 84 IPC_ENUM_TRAITS(PP_AudioSampleRate) | 85 IPC_ENUM_TRAITS(PP_AudioSampleRate) |
| 85 IPC_ENUM_TRAITS(PP_DeviceType_Dev) | 86 IPC_ENUM_TRAITS(PP_DeviceType_Dev) |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 293 IPC_STRUCT_TRAITS_MEMBER(key_code) | 294 IPC_STRUCT_TRAITS_MEMBER(key_code) |
| 294 IPC_STRUCT_TRAITS_MEMBER(code) | 295 IPC_STRUCT_TRAITS_MEMBER(code) |
| 295 IPC_STRUCT_TRAITS_MEMBER(character_text) | 296 IPC_STRUCT_TRAITS_MEMBER(character_text) |
| 296 IPC_STRUCT_TRAITS_MEMBER(composition_segment_offsets) | 297 IPC_STRUCT_TRAITS_MEMBER(composition_segment_offsets) |
| 297 IPC_STRUCT_TRAITS_MEMBER(composition_target_segment) | 298 IPC_STRUCT_TRAITS_MEMBER(composition_target_segment) |
| 298 IPC_STRUCT_TRAITS_MEMBER(composition_selection_start) | 299 IPC_STRUCT_TRAITS_MEMBER(composition_selection_start) |
| 299 IPC_STRUCT_TRAITS_MEMBER(composition_selection_end) | 300 IPC_STRUCT_TRAITS_MEMBER(composition_selection_end) |
| 300 IPC_STRUCT_TRAITS_MEMBER(touches) | 301 IPC_STRUCT_TRAITS_MEMBER(touches) |
| 301 IPC_STRUCT_TRAITS_MEMBER(changed_touches) | 302 IPC_STRUCT_TRAITS_MEMBER(changed_touches) |
| 302 IPC_STRUCT_TRAITS_MEMBER(target_touches) | 303 IPC_STRUCT_TRAITS_MEMBER(target_touches) |
| 304 IPC_STRUCT_TRAITS_MEMBER(latency_info) |
| 303 IPC_STRUCT_TRAITS_END() | 305 IPC_STRUCT_TRAITS_END() |
| 304 | 306 |
| 305 IPC_STRUCT_TRAITS_BEGIN(ppapi::HostPortPair) | 307 IPC_STRUCT_TRAITS_BEGIN(ppapi::HostPortPair) |
| 306 IPC_STRUCT_TRAITS_MEMBER(host) | 308 IPC_STRUCT_TRAITS_MEMBER(host) |
| 307 IPC_STRUCT_TRAITS_MEMBER(port) | 309 IPC_STRUCT_TRAITS_MEMBER(port) |
| 308 IPC_STRUCT_TRAITS_END() | 310 IPC_STRUCT_TRAITS_END() |
| 309 | 311 |
| 310 IPC_STRUCT_TRAITS_BEGIN(ppapi::URLRequestInfoData) | 312 IPC_STRUCT_TRAITS_BEGIN(ppapi::URLRequestInfoData) |
| 311 IPC_STRUCT_TRAITS_MEMBER(url) | 313 IPC_STRUCT_TRAITS_MEMBER(url) |
| 312 IPC_STRUCT_TRAITS_MEMBER(method) | 314 IPC_STRUCT_TRAITS_MEMBER(method) |
| (...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 877 PP_Instance /* instance */, | 879 PP_Instance /* instance */, |
| 878 PP_Bool /* result */, | 880 PP_Bool /* result */, |
| 879 PP_Size /* size */) | 881 PP_Size /* size */) |
| 880 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_RequestInputEvents, | 882 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_RequestInputEvents, |
| 881 PP_Instance /* instance */, | 883 PP_Instance /* instance */, |
| 882 bool /* is_filtering */, | 884 bool /* is_filtering */, |
| 883 uint32_t /* event_classes */) | 885 uint32_t /* event_classes */) |
| 884 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBInstance_ClearInputEvents, | 886 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBInstance_ClearInputEvents, |
| 885 PP_Instance /* instance */, | 887 PP_Instance /* instance */, |
| 886 uint32_t /* event_classes */) | 888 uint32_t /* event_classes */) |
| 889 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBInstance_StartTrackingLatency, |
| 890 PP_Instance /* instance */) |
| 887 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBInstance_PostMessage, | 891 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBInstance_PostMessage, |
| 888 PP_Instance /* instance */, | 892 PP_Instance /* instance */, |
| 889 ppapi::proxy::SerializedVar /* message */) | 893 ppapi::proxy::SerializedVar /* message */) |
| 890 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBInstance_LockMouse, | 894 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBInstance_LockMouse, |
| 891 PP_Instance /* instance */) | 895 PP_Instance /* instance */) |
| 892 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBInstance_UnlockMouse, | 896 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBInstance_UnlockMouse, |
| 893 PP_Instance /* instance */) | 897 PP_Instance /* instance */) |
| 894 IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBInstance_ResolveRelativeToDocument, | 898 IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBInstance_ResolveRelativeToDocument, |
| 895 PP_Instance /* instance */, | 899 PP_Instance /* instance */, |
| 896 ppapi::proxy::SerializedVar /* relative */, | 900 ppapi::proxy::SerializedVar /* relative */, |
| (...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1411 IPC_MESSAGE_CONTROL3(PpapiHostMsg_Graphics2D_Scroll, | 1415 IPC_MESSAGE_CONTROL3(PpapiHostMsg_Graphics2D_Scroll, |
| 1412 bool /* clip_specified */, | 1416 bool /* clip_specified */, |
| 1413 PP_Rect /* clip */, | 1417 PP_Rect /* clip */, |
| 1414 PP_Point /* amount */) | 1418 PP_Point /* amount */) |
| 1415 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Graphics2D_ReplaceContents, | 1419 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Graphics2D_ReplaceContents, |
| 1416 ppapi::HostResource /* image_data */) | 1420 ppapi::HostResource /* image_data */) |
| 1417 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Graphics2D_SetScale, | 1421 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Graphics2D_SetScale, |
| 1418 float /* scale */) | 1422 float /* scale */) |
| 1419 | 1423 |
| 1420 // Graphics2D, plugin -> host -> plugin | 1424 // Graphics2D, plugin -> host -> plugin |
| 1421 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Graphics2D_Flush) | 1425 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Graphics2D_Flush, |
| 1426 std::vector<ui::LatencyInfo> /* latency_info */) |
| 1422 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Graphics2D_FlushAck) | 1427 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Graphics2D_FlushAck) |
| 1423 | 1428 |
| 1424 IPC_MESSAGE_CONTROL2(PpapiHostMsg_Graphics2D_ReadImageData, | 1429 IPC_MESSAGE_CONTROL2(PpapiHostMsg_Graphics2D_ReadImageData, |
| 1425 PP_Resource /* image */, | 1430 PP_Resource /* image */, |
| 1426 PP_Point /* top_left */) | 1431 PP_Point /* top_left */) |
| 1427 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Graphics2D_ReadImageDataAck) | 1432 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Graphics2D_ReadImageDataAck) |
| 1428 | 1433 |
| 1429 // IsolatedFileSystem | 1434 // IsolatedFileSystem |
| 1430 IPC_MESSAGE_CONTROL0(PpapiHostMsg_IsolatedFileSystem_Create) | 1435 IPC_MESSAGE_CONTROL0(PpapiHostMsg_IsolatedFileSystem_Create) |
| 1431 IPC_MESSAGE_CONTROL1(PpapiHostMsg_IsolatedFileSystem_BrowserOpen, | 1436 IPC_MESSAGE_CONTROL1(PpapiHostMsg_IsolatedFileSystem_BrowserOpen, |
| (...skipping 681 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2113 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, | 2118 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, |
| 2114 PP_TalkPermission /* permission */) | 2119 PP_TalkPermission /* permission */) |
| 2115 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) | 2120 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) |
| 2116 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) | 2121 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) |
| 2117 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) | 2122 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) |
| 2118 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) | 2123 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) |
| 2119 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) | 2124 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) |
| 2120 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) | 2125 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) |
| 2121 | 2126 |
| 2122 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) | 2127 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) |
| OLD | NEW |