Chromium Code Reviews| 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 // Copied from "content/common/content_param_traits_macros.h" | |
| 130 // We can eliminate the duplication if we have a content_common_nacl.gyp build. | |
|
piman
2014/04/25 01:59:43
Can we just move the definition into some, say, ui
Yufeng Shen (Slow to review)
2014/05/01 21:29:52
moved it into
ui/events/latency_info_param_traits
| |
| 131 #if defined(OS_NACL) | |
| 132 IPC_ENUM_TRAITS_MAX_VALUE(ui::LatencyComponentType, | |
| 133 ui::LATENCY_COMPONENT_TYPE_LAST) | |
| 134 | |
| 135 IPC_STRUCT_TRAITS_BEGIN(ui::LatencyInfo::LatencyComponent) | |
| 136 IPC_STRUCT_TRAITS_MEMBER(sequence_number) | |
| 137 IPC_STRUCT_TRAITS_MEMBER(event_time) | |
| 138 IPC_STRUCT_TRAITS_MEMBER(event_count) | |
| 139 IPC_STRUCT_TRAITS_END() | |
| 140 | |
| 141 IPC_STRUCT_TRAITS_BEGIN(ui::LatencyInfo) | |
| 142 IPC_STRUCT_TRAITS_MEMBER(latency_components) | |
| 143 IPC_STRUCT_TRAITS_MEMBER(trace_id) | |
| 144 IPC_STRUCT_TRAITS_MEMBER(terminated) | |
| 145 IPC_STRUCT_TRAITS_END() | |
| 146 #endif // defined(OS_NACL) | |
| 147 | |
| 124 IPC_STRUCT_TRAITS_BEGIN(PP_Point) | 148 IPC_STRUCT_TRAITS_BEGIN(PP_Point) |
| 125 IPC_STRUCT_TRAITS_MEMBER(x) | 149 IPC_STRUCT_TRAITS_MEMBER(x) |
| 126 IPC_STRUCT_TRAITS_MEMBER(y) | 150 IPC_STRUCT_TRAITS_MEMBER(y) |
| 127 IPC_STRUCT_TRAITS_END() | 151 IPC_STRUCT_TRAITS_END() |
| 128 | 152 |
| 129 IPC_STRUCT_TRAITS_BEGIN(PP_FloatPoint) | 153 IPC_STRUCT_TRAITS_BEGIN(PP_FloatPoint) |
| 130 IPC_STRUCT_TRAITS_MEMBER(x) | 154 IPC_STRUCT_TRAITS_MEMBER(x) |
| 131 IPC_STRUCT_TRAITS_MEMBER(y) | 155 IPC_STRUCT_TRAITS_MEMBER(y) |
| 132 IPC_STRUCT_TRAITS_END() | 156 IPC_STRUCT_TRAITS_END() |
| 133 | 157 |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 293 IPC_STRUCT_TRAITS_MEMBER(key_code) | 317 IPC_STRUCT_TRAITS_MEMBER(key_code) |
| 294 IPC_STRUCT_TRAITS_MEMBER(code) | 318 IPC_STRUCT_TRAITS_MEMBER(code) |
| 295 IPC_STRUCT_TRAITS_MEMBER(character_text) | 319 IPC_STRUCT_TRAITS_MEMBER(character_text) |
| 296 IPC_STRUCT_TRAITS_MEMBER(composition_segment_offsets) | 320 IPC_STRUCT_TRAITS_MEMBER(composition_segment_offsets) |
| 297 IPC_STRUCT_TRAITS_MEMBER(composition_target_segment) | 321 IPC_STRUCT_TRAITS_MEMBER(composition_target_segment) |
| 298 IPC_STRUCT_TRAITS_MEMBER(composition_selection_start) | 322 IPC_STRUCT_TRAITS_MEMBER(composition_selection_start) |
| 299 IPC_STRUCT_TRAITS_MEMBER(composition_selection_end) | 323 IPC_STRUCT_TRAITS_MEMBER(composition_selection_end) |
| 300 IPC_STRUCT_TRAITS_MEMBER(touches) | 324 IPC_STRUCT_TRAITS_MEMBER(touches) |
| 301 IPC_STRUCT_TRAITS_MEMBER(changed_touches) | 325 IPC_STRUCT_TRAITS_MEMBER(changed_touches) |
| 302 IPC_STRUCT_TRAITS_MEMBER(target_touches) | 326 IPC_STRUCT_TRAITS_MEMBER(target_touches) |
| 327 IPC_STRUCT_TRAITS_MEMBER(latency_info) | |
| 303 IPC_STRUCT_TRAITS_END() | 328 IPC_STRUCT_TRAITS_END() |
| 304 | 329 |
| 305 IPC_STRUCT_TRAITS_BEGIN(ppapi::HostPortPair) | 330 IPC_STRUCT_TRAITS_BEGIN(ppapi::HostPortPair) |
| 306 IPC_STRUCT_TRAITS_MEMBER(host) | 331 IPC_STRUCT_TRAITS_MEMBER(host) |
| 307 IPC_STRUCT_TRAITS_MEMBER(port) | 332 IPC_STRUCT_TRAITS_MEMBER(port) |
| 308 IPC_STRUCT_TRAITS_END() | 333 IPC_STRUCT_TRAITS_END() |
| 309 | 334 |
| 310 IPC_STRUCT_TRAITS_BEGIN(ppapi::URLRequestInfoData) | 335 IPC_STRUCT_TRAITS_BEGIN(ppapi::URLRequestInfoData) |
| 311 IPC_STRUCT_TRAITS_MEMBER(url) | 336 IPC_STRUCT_TRAITS_MEMBER(url) |
| 312 IPC_STRUCT_TRAITS_MEMBER(method) | 337 IPC_STRUCT_TRAITS_MEMBER(method) |
| (...skipping 1097 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1410 IPC_MESSAGE_CONTROL3(PpapiHostMsg_Graphics2D_Scroll, | 1435 IPC_MESSAGE_CONTROL3(PpapiHostMsg_Graphics2D_Scroll, |
| 1411 bool /* clip_specified */, | 1436 bool /* clip_specified */, |
| 1412 PP_Rect /* clip */, | 1437 PP_Rect /* clip */, |
| 1413 PP_Point /* amount */) | 1438 PP_Point /* amount */) |
| 1414 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Graphics2D_ReplaceContents, | 1439 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Graphics2D_ReplaceContents, |
| 1415 ppapi::HostResource /* image_data */) | 1440 ppapi::HostResource /* image_data */) |
| 1416 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Graphics2D_SetScale, | 1441 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Graphics2D_SetScale, |
| 1417 float /* scale */) | 1442 float /* scale */) |
| 1418 | 1443 |
| 1419 // Graphics2D, plugin -> host -> plugin | 1444 // Graphics2D, plugin -> host -> plugin |
| 1420 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Graphics2D_Flush) | 1445 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Graphics2D_Flush, |
| 1446 std::vector<ui::LatencyInfo> /* latency_info */) | |
| 1421 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Graphics2D_FlushAck) | 1447 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Graphics2D_FlushAck) |
| 1422 | 1448 |
| 1423 IPC_MESSAGE_CONTROL2(PpapiHostMsg_Graphics2D_ReadImageData, | 1449 IPC_MESSAGE_CONTROL2(PpapiHostMsg_Graphics2D_ReadImageData, |
| 1424 PP_Resource /* image */, | 1450 PP_Resource /* image */, |
| 1425 PP_Point /* top_left */) | 1451 PP_Point /* top_left */) |
| 1426 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Graphics2D_ReadImageDataAck) | 1452 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Graphics2D_ReadImageDataAck) |
| 1427 | 1453 |
| 1428 // IsolatedFileSystem | 1454 // IsolatedFileSystem |
| 1429 IPC_MESSAGE_CONTROL0(PpapiHostMsg_IsolatedFileSystem_Create) | 1455 IPC_MESSAGE_CONTROL0(PpapiHostMsg_IsolatedFileSystem_Create) |
| 1430 IPC_MESSAGE_CONTROL1(PpapiHostMsg_IsolatedFileSystem_BrowserOpen, | 1456 IPC_MESSAGE_CONTROL1(PpapiHostMsg_IsolatedFileSystem_BrowserOpen, |
| (...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2107 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, | 2133 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, |
| 2108 PP_TalkPermission /* permission */) | 2134 PP_TalkPermission /* permission */) |
| 2109 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) | 2135 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) |
| 2110 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) | 2136 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) |
| 2111 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) | 2137 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) |
| 2112 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) | 2138 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) |
| 2113 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) | 2139 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) |
| 2114 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) | 2140 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) |
| 2115 | 2141 |
| 2116 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) | 2142 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) |
| OLD | NEW |