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/latency_info.h" |
| 77 |
| 78 #if !defined(OS_NACL) |
| 79 #include "content/common/content_param_traits_macros.h" |
| 80 #endif |
76 | 81 |
77 #undef IPC_MESSAGE_EXPORT | 82 #undef IPC_MESSAGE_EXPORT |
78 #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT | 83 #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT |
79 | 84 |
80 #define IPC_MESSAGE_START PpapiMsgStart | 85 #define IPC_MESSAGE_START PpapiMsgStart |
81 | 86 |
82 IPC_ENUM_TRAITS_MAX_VALUE(ppapi::TCPSocketVersion, | 87 IPC_ENUM_TRAITS_MAX_VALUE(ppapi::TCPSocketVersion, |
83 ppapi::TCP_SOCKET_VERSION_1_1_OR_ABOVE) | 88 ppapi::TCP_SOCKET_VERSION_1_1_OR_ABOVE) |
84 IPC_ENUM_TRAITS(PP_AudioSampleRate) | 89 IPC_ENUM_TRAITS(PP_AudioSampleRate) |
85 IPC_ENUM_TRAITS(PP_DeviceType_Dev) | 90 IPC_ENUM_TRAITS(PP_DeviceType_Dev) |
(...skipping 28 matching lines...) Expand all Loading... |
114 IPC_ENUM_TRAITS(PP_TrueTypeFontStyle_Dev) | 119 IPC_ENUM_TRAITS(PP_TrueTypeFontStyle_Dev) |
115 IPC_ENUM_TRAITS(PP_TrueTypeFontWeight_Dev) | 120 IPC_ENUM_TRAITS(PP_TrueTypeFontWeight_Dev) |
116 IPC_ENUM_TRAITS(PP_TrueTypeFontWidth_Dev) | 121 IPC_ENUM_TRAITS(PP_TrueTypeFontWidth_Dev) |
117 IPC_ENUM_TRAITS(PP_TrueTypeFontCharset_Dev) | 122 IPC_ENUM_TRAITS(PP_TrueTypeFontCharset_Dev) |
118 IPC_ENUM_TRAITS_MAX_VALUE(PP_UDPSocket_Option, | 123 IPC_ENUM_TRAITS_MAX_VALUE(PP_UDPSocket_Option, |
119 PP_UDPSOCKET_OPTION_RECV_BUFFER_SIZE) | 124 PP_UDPSOCKET_OPTION_RECV_BUFFER_SIZE) |
120 IPC_ENUM_TRAITS(PP_VideoDecodeError_Dev) | 125 IPC_ENUM_TRAITS(PP_VideoDecodeError_Dev) |
121 IPC_ENUM_TRAITS(PP_VideoDecoder_Profile) | 126 IPC_ENUM_TRAITS(PP_VideoDecoder_Profile) |
122 IPC_ENUM_TRAITS_MAX_VALUE(PP_VideoFrame_Format, PP_VIDEOFRAME_FORMAT_LAST) | 127 IPC_ENUM_TRAITS_MAX_VALUE(PP_VideoFrame_Format, PP_VIDEOFRAME_FORMAT_LAST) |
123 | 128 |
| 129 // For nacl build, we pull the definition directly from |
| 130 // "latency_info_param_traits_macros.h" instead of through |
| 131 // "content/common/content_param_traits_macros.h" so we don't have to |
| 132 // rely on a nacl content build. |
| 133 #if defined(OS_NACL) |
| 134 #include "ui/events/latency_info_param_traits_macros.h" |
| 135 #endif |
| 136 |
124 IPC_STRUCT_TRAITS_BEGIN(PP_Point) | 137 IPC_STRUCT_TRAITS_BEGIN(PP_Point) |
125 IPC_STRUCT_TRAITS_MEMBER(x) | 138 IPC_STRUCT_TRAITS_MEMBER(x) |
126 IPC_STRUCT_TRAITS_MEMBER(y) | 139 IPC_STRUCT_TRAITS_MEMBER(y) |
127 IPC_STRUCT_TRAITS_END() | 140 IPC_STRUCT_TRAITS_END() |
128 | 141 |
129 IPC_STRUCT_TRAITS_BEGIN(PP_FloatPoint) | 142 IPC_STRUCT_TRAITS_BEGIN(PP_FloatPoint) |
130 IPC_STRUCT_TRAITS_MEMBER(x) | 143 IPC_STRUCT_TRAITS_MEMBER(x) |
131 IPC_STRUCT_TRAITS_MEMBER(y) | 144 IPC_STRUCT_TRAITS_MEMBER(y) |
132 IPC_STRUCT_TRAITS_END() | 145 IPC_STRUCT_TRAITS_END() |
133 | 146 |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
293 IPC_STRUCT_TRAITS_MEMBER(key_code) | 306 IPC_STRUCT_TRAITS_MEMBER(key_code) |
294 IPC_STRUCT_TRAITS_MEMBER(code) | 307 IPC_STRUCT_TRAITS_MEMBER(code) |
295 IPC_STRUCT_TRAITS_MEMBER(character_text) | 308 IPC_STRUCT_TRAITS_MEMBER(character_text) |
296 IPC_STRUCT_TRAITS_MEMBER(composition_segment_offsets) | 309 IPC_STRUCT_TRAITS_MEMBER(composition_segment_offsets) |
297 IPC_STRUCT_TRAITS_MEMBER(composition_target_segment) | 310 IPC_STRUCT_TRAITS_MEMBER(composition_target_segment) |
298 IPC_STRUCT_TRAITS_MEMBER(composition_selection_start) | 311 IPC_STRUCT_TRAITS_MEMBER(composition_selection_start) |
299 IPC_STRUCT_TRAITS_MEMBER(composition_selection_end) | 312 IPC_STRUCT_TRAITS_MEMBER(composition_selection_end) |
300 IPC_STRUCT_TRAITS_MEMBER(touches) | 313 IPC_STRUCT_TRAITS_MEMBER(touches) |
301 IPC_STRUCT_TRAITS_MEMBER(changed_touches) | 314 IPC_STRUCT_TRAITS_MEMBER(changed_touches) |
302 IPC_STRUCT_TRAITS_MEMBER(target_touches) | 315 IPC_STRUCT_TRAITS_MEMBER(target_touches) |
| 316 IPC_STRUCT_TRAITS_MEMBER(latency_info) |
303 IPC_STRUCT_TRAITS_END() | 317 IPC_STRUCT_TRAITS_END() |
304 | 318 |
305 IPC_STRUCT_TRAITS_BEGIN(ppapi::HostPortPair) | 319 IPC_STRUCT_TRAITS_BEGIN(ppapi::HostPortPair) |
306 IPC_STRUCT_TRAITS_MEMBER(host) | 320 IPC_STRUCT_TRAITS_MEMBER(host) |
307 IPC_STRUCT_TRAITS_MEMBER(port) | 321 IPC_STRUCT_TRAITS_MEMBER(port) |
308 IPC_STRUCT_TRAITS_END() | 322 IPC_STRUCT_TRAITS_END() |
309 | 323 |
310 IPC_STRUCT_TRAITS_BEGIN(ppapi::URLRequestInfoData) | 324 IPC_STRUCT_TRAITS_BEGIN(ppapi::URLRequestInfoData) |
311 IPC_STRUCT_TRAITS_MEMBER(url) | 325 IPC_STRUCT_TRAITS_MEMBER(url) |
312 IPC_STRUCT_TRAITS_MEMBER(method) | 326 IPC_STRUCT_TRAITS_MEMBER(method) |
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
872 PP_Instance /* instance */, | 886 PP_Instance /* instance */, |
873 PP_Bool /* result */, | 887 PP_Bool /* result */, |
874 PP_Size /* size */) | 888 PP_Size /* size */) |
875 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_RequestInputEvents, | 889 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_RequestInputEvents, |
876 PP_Instance /* instance */, | 890 PP_Instance /* instance */, |
877 bool /* is_filtering */, | 891 bool /* is_filtering */, |
878 uint32_t /* event_classes */) | 892 uint32_t /* event_classes */) |
879 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBInstance_ClearInputEvents, | 893 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBInstance_ClearInputEvents, |
880 PP_Instance /* instance */, | 894 PP_Instance /* instance */, |
881 uint32_t /* event_classes */) | 895 uint32_t /* event_classes */) |
| 896 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBInstance_StartTrackingLatency, |
| 897 PP_Instance /* instance */) |
882 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBInstance_PostMessage, | 898 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBInstance_PostMessage, |
883 PP_Instance /* instance */, | 899 PP_Instance /* instance */, |
884 ppapi::proxy::SerializedVar /* message */) | 900 ppapi::proxy::SerializedVar /* message */) |
885 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBInstance_LockMouse, | 901 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBInstance_LockMouse, |
886 PP_Instance /* instance */) | 902 PP_Instance /* instance */) |
887 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBInstance_UnlockMouse, | 903 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBInstance_UnlockMouse, |
888 PP_Instance /* instance */) | 904 PP_Instance /* instance */) |
889 IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBInstance_ResolveRelativeToDocument, | 905 IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBInstance_ResolveRelativeToDocument, |
890 PP_Instance /* instance */, | 906 PP_Instance /* instance */, |
891 ppapi::proxy::SerializedVar /* relative */, | 907 ppapi::proxy::SerializedVar /* relative */, |
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1406 IPC_MESSAGE_CONTROL3(PpapiHostMsg_Graphics2D_Scroll, | 1422 IPC_MESSAGE_CONTROL3(PpapiHostMsg_Graphics2D_Scroll, |
1407 bool /* clip_specified */, | 1423 bool /* clip_specified */, |
1408 PP_Rect /* clip */, | 1424 PP_Rect /* clip */, |
1409 PP_Point /* amount */) | 1425 PP_Point /* amount */) |
1410 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Graphics2D_ReplaceContents, | 1426 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Graphics2D_ReplaceContents, |
1411 ppapi::HostResource /* image_data */) | 1427 ppapi::HostResource /* image_data */) |
1412 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Graphics2D_SetScale, | 1428 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Graphics2D_SetScale, |
1413 float /* scale */) | 1429 float /* scale */) |
1414 | 1430 |
1415 // Graphics2D, plugin -> host -> plugin | 1431 // Graphics2D, plugin -> host -> plugin |
1416 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Graphics2D_Flush) | 1432 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Graphics2D_Flush, |
| 1433 std::vector<ui::LatencyInfo> /* latency_info */) |
1417 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Graphics2D_FlushAck) | 1434 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Graphics2D_FlushAck) |
1418 | 1435 |
1419 IPC_MESSAGE_CONTROL2(PpapiHostMsg_Graphics2D_ReadImageData, | 1436 IPC_MESSAGE_CONTROL2(PpapiHostMsg_Graphics2D_ReadImageData, |
1420 PP_Resource /* image */, | 1437 PP_Resource /* image */, |
1421 PP_Point /* top_left */) | 1438 PP_Point /* top_left */) |
1422 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Graphics2D_ReadImageDataAck) | 1439 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Graphics2D_ReadImageDataAck) |
1423 | 1440 |
1424 // IsolatedFileSystem | 1441 // IsolatedFileSystem |
1425 IPC_MESSAGE_CONTROL0(PpapiHostMsg_IsolatedFileSystem_Create) | 1442 IPC_MESSAGE_CONTROL0(PpapiHostMsg_IsolatedFileSystem_Create) |
1426 IPC_MESSAGE_CONTROL1(PpapiHostMsg_IsolatedFileSystem_BrowserOpen, | 1443 IPC_MESSAGE_CONTROL1(PpapiHostMsg_IsolatedFileSystem_BrowserOpen, |
(...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2103 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, | 2120 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, |
2104 PP_TalkPermission /* permission */) | 2121 PP_TalkPermission /* permission */) |
2105 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) | 2122 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) |
2106 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) | 2123 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) |
2107 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) | 2124 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) |
2108 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) | 2125 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) |
2109 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) | 2126 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) |
2110 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) | 2127 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) |
2111 | 2128 |
2112 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) | 2129 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) |
OLD | NEW |