| 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 #include "ppapi/proxy/ppapi_proxy_export.h" | 55 #include "ppapi/proxy/ppapi_proxy_export.h" |
| 56 #include "ppapi/proxy/resource_message_params.h" | 56 #include "ppapi/proxy/resource_message_params.h" |
| 57 #include "ppapi/proxy/serialized_flash_menu.h" | 57 #include "ppapi/proxy/serialized_flash_menu.h" |
| 58 #include "ppapi/proxy/serialized_handle.h" | 58 #include "ppapi/proxy/serialized_handle.h" |
| 59 #include "ppapi/proxy/serialized_structs.h" | 59 #include "ppapi/proxy/serialized_structs.h" |
| 60 #include "ppapi/proxy/serialized_var.h" | 60 #include "ppapi/proxy/serialized_var.h" |
| 61 #include "ppapi/shared_impl/dir_contents.h" | 61 #include "ppapi/shared_impl/dir_contents.h" |
| 62 #include "ppapi/shared_impl/file_growth.h" | 62 #include "ppapi/shared_impl/file_growth.h" |
| 63 #include "ppapi/shared_impl/file_path.h" | 63 #include "ppapi/shared_impl/file_path.h" |
| 64 #include "ppapi/shared_impl/file_ref_create_info.h" | 64 #include "ppapi/shared_impl/file_ref_create_info.h" |
| 65 #include "ppapi/shared_impl/media_stream_video_track_shared.h" |
| 65 #include "ppapi/shared_impl/ppapi_nacl_plugin_args.h" | 66 #include "ppapi/shared_impl/ppapi_nacl_plugin_args.h" |
| 66 #include "ppapi/shared_impl/ppapi_preferences.h" | 67 #include "ppapi/shared_impl/ppapi_preferences.h" |
| 67 #include "ppapi/shared_impl/ppb_device_ref_shared.h" | 68 #include "ppapi/shared_impl/ppb_device_ref_shared.h" |
| 68 #include "ppapi/shared_impl/ppb_input_event_shared.h" | 69 #include "ppapi/shared_impl/ppb_input_event_shared.h" |
| 69 #include "ppapi/shared_impl/ppb_tcp_socket_shared.h" | 70 #include "ppapi/shared_impl/ppb_tcp_socket_shared.h" |
| 70 #include "ppapi/shared_impl/ppb_view_shared.h" | 71 #include "ppapi/shared_impl/ppb_view_shared.h" |
| 71 #include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h" | 72 #include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h" |
| 72 #include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h" | 73 #include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h" |
| 73 #include "ppapi/shared_impl/socket_option_data.h" | 74 #include "ppapi/shared_impl/socket_option_data.h" |
| 74 #include "ppapi/shared_impl/url_request_info_data.h" | 75 #include "ppapi/shared_impl/url_request_info_data.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 IPC_ENUM_TRAITS(PP_TextInput_Type) | 115 IPC_ENUM_TRAITS(PP_TextInput_Type) |
| 115 IPC_ENUM_TRAITS(PP_TrueTypeFontFamily_Dev) | 116 IPC_ENUM_TRAITS(PP_TrueTypeFontFamily_Dev) |
| 116 IPC_ENUM_TRAITS(PP_TrueTypeFontStyle_Dev) | 117 IPC_ENUM_TRAITS(PP_TrueTypeFontStyle_Dev) |
| 117 IPC_ENUM_TRAITS(PP_TrueTypeFontWeight_Dev) | 118 IPC_ENUM_TRAITS(PP_TrueTypeFontWeight_Dev) |
| 118 IPC_ENUM_TRAITS(PP_TrueTypeFontWidth_Dev) | 119 IPC_ENUM_TRAITS(PP_TrueTypeFontWidth_Dev) |
| 119 IPC_ENUM_TRAITS(PP_TrueTypeFontCharset_Dev) | 120 IPC_ENUM_TRAITS(PP_TrueTypeFontCharset_Dev) |
| 120 IPC_ENUM_TRAITS_MAX_VALUE(PP_UDPSocket_Option, | 121 IPC_ENUM_TRAITS_MAX_VALUE(PP_UDPSocket_Option, |
| 121 PP_UDPSOCKET_OPTION_RECV_BUFFER_SIZE) | 122 PP_UDPSOCKET_OPTION_RECV_BUFFER_SIZE) |
| 122 IPC_ENUM_TRAITS(PP_VideoDecodeError_Dev) | 123 IPC_ENUM_TRAITS(PP_VideoDecodeError_Dev) |
| 123 IPC_ENUM_TRAITS(PP_VideoDecoder_Profile) | 124 IPC_ENUM_TRAITS(PP_VideoDecoder_Profile) |
| 125 IPC_ENUM_TRAITS_MAX_VALUE(PP_VideoFrame_Format, PP_VIDEOFRAME_FORMAT_LAST) |
| 124 | 126 |
| 125 IPC_STRUCT_TRAITS_BEGIN(PP_Point) | 127 IPC_STRUCT_TRAITS_BEGIN(PP_Point) |
| 126 IPC_STRUCT_TRAITS_MEMBER(x) | 128 IPC_STRUCT_TRAITS_MEMBER(x) |
| 127 IPC_STRUCT_TRAITS_MEMBER(y) | 129 IPC_STRUCT_TRAITS_MEMBER(y) |
| 128 IPC_STRUCT_TRAITS_END() | 130 IPC_STRUCT_TRAITS_END() |
| 129 | 131 |
| 130 IPC_STRUCT_TRAITS_BEGIN(PP_FloatPoint) | 132 IPC_STRUCT_TRAITS_BEGIN(PP_FloatPoint) |
| 131 IPC_STRUCT_TRAITS_MEMBER(x) | 133 IPC_STRUCT_TRAITS_MEMBER(x) |
| 132 IPC_STRUCT_TRAITS_MEMBER(y) | 134 IPC_STRUCT_TRAITS_MEMBER(y) |
| 133 IPC_STRUCT_TRAITS_END() | 135 IPC_STRUCT_TRAITS_END() |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 IPC_STRUCT_TRAITS_MEMBER(browser_pending_host_resource_id) | 236 IPC_STRUCT_TRAITS_MEMBER(browser_pending_host_resource_id) |
| 235 IPC_STRUCT_TRAITS_MEMBER(renderer_pending_host_resource_id) | 237 IPC_STRUCT_TRAITS_MEMBER(renderer_pending_host_resource_id) |
| 236 IPC_STRUCT_TRAITS_MEMBER(file_system_plugin_resource) | 238 IPC_STRUCT_TRAITS_MEMBER(file_system_plugin_resource) |
| 237 IPC_STRUCT_TRAITS_END() | 239 IPC_STRUCT_TRAITS_END() |
| 238 | 240 |
| 239 IPC_STRUCT_TRAITS_BEGIN(ppapi::FlashSiteSetting) | 241 IPC_STRUCT_TRAITS_BEGIN(ppapi::FlashSiteSetting) |
| 240 IPC_STRUCT_TRAITS_MEMBER(site) | 242 IPC_STRUCT_TRAITS_MEMBER(site) |
| 241 IPC_STRUCT_TRAITS_MEMBER(permission) | 243 IPC_STRUCT_TRAITS_MEMBER(permission) |
| 242 IPC_STRUCT_TRAITS_END() | 244 IPC_STRUCT_TRAITS_END() |
| 243 | 245 |
| 246 IPC_STRUCT_TRAITS_BEGIN(ppapi::MediaStreamVideoTrackShared::Attributes) |
| 247 IPC_STRUCT_TRAITS_MEMBER(buffers) |
| 248 IPC_STRUCT_TRAITS_MEMBER(width) |
| 249 IPC_STRUCT_TRAITS_MEMBER(height) |
| 250 IPC_STRUCT_TRAITS_MEMBER(format) |
| 251 IPC_STRUCT_TRAITS_END() |
| 252 |
| 244 IPC_STRUCT_TRAITS_BEGIN(ppapi::ViewData) | 253 IPC_STRUCT_TRAITS_BEGIN(ppapi::ViewData) |
| 245 IPC_STRUCT_TRAITS_MEMBER(rect) | 254 IPC_STRUCT_TRAITS_MEMBER(rect) |
| 246 IPC_STRUCT_TRAITS_MEMBER(is_fullscreen) | 255 IPC_STRUCT_TRAITS_MEMBER(is_fullscreen) |
| 247 IPC_STRUCT_TRAITS_MEMBER(is_page_visible) | 256 IPC_STRUCT_TRAITS_MEMBER(is_page_visible) |
| 248 IPC_STRUCT_TRAITS_MEMBER(clip_rect) | 257 IPC_STRUCT_TRAITS_MEMBER(clip_rect) |
| 249 IPC_STRUCT_TRAITS_MEMBER(device_scale) | 258 IPC_STRUCT_TRAITS_MEMBER(device_scale) |
| 250 IPC_STRUCT_TRAITS_MEMBER(css_scale) | 259 IPC_STRUCT_TRAITS_MEMBER(css_scale) |
| 251 IPC_STRUCT_TRAITS_END() | 260 IPC_STRUCT_TRAITS_END() |
| 252 | 261 |
| 253 IPC_STRUCT_TRAITS_BEGIN(PP_TouchPoint) | 262 IPC_STRUCT_TRAITS_BEGIN(PP_TouchPoint) |
| (...skipping 1184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1438 IPC_MESSAGE_CONTROL1(PpapiHostMsg_IsolatedFileSystem_BrowserOpen, | 1447 IPC_MESSAGE_CONTROL1(PpapiHostMsg_IsolatedFileSystem_BrowserOpen, |
| 1439 PP_IsolatedFileSystemType_Private /* type */) | 1448 PP_IsolatedFileSystemType_Private /* type */) |
| 1440 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_IsolatedFileSystem_BrowserOpenReply, | 1449 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_IsolatedFileSystem_BrowserOpenReply, |
| 1441 std::string /* fsid */) | 1450 std::string /* fsid */) |
| 1442 | 1451 |
| 1443 // MediaStream ----------------------------------------------------------------- | 1452 // MediaStream ----------------------------------------------------------------- |
| 1444 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_MediaStreamAudioTrack_CreateFromPendingHost, | 1453 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_MediaStreamAudioTrack_CreateFromPendingHost, |
| 1445 std::string /* track_id */) | 1454 std::string /* track_id */) |
| 1446 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_MediaStreamVideoTrack_CreateFromPendingHost, | 1455 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_MediaStreamVideoTrack_CreateFromPendingHost, |
| 1447 std::string /* track_id */) | 1456 std::string /* track_id */) |
| 1457 IPC_MESSAGE_CONTROL1( |
| 1458 PpapiHostMsg_MediaStreamVideoTrack_Configure, |
| 1459 ppapi::MediaStreamVideoTrackShared::Attributes /* attributes */) |
| 1460 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_MediaStreamVideoTrack_ConfigureReply) |
| 1448 | 1461 |
| 1449 // Message for init buffers. It also takes a shared memory handle which is put | 1462 // Message for init buffers. It also takes a shared memory handle which is put |
| 1450 // in the outer ResourceReplyMessage. | 1463 // in the outer ResourceReplyMessage. |
| 1451 IPC_MESSAGE_CONTROL2(PpapiPluginMsg_MediaStreamTrack_InitBuffers, | 1464 IPC_MESSAGE_CONTROL2(PpapiPluginMsg_MediaStreamTrack_InitBuffers, |
| 1452 int32_t /* number_of_buffers */, | 1465 int32_t /* number_of_buffers */, |
| 1453 int32_t /* buffer_size */) | 1466 int32_t /* buffer_size */) |
| 1454 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_MediaStreamTrack_EnqueueBuffer, | 1467 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_MediaStreamTrack_EnqueueBuffer, |
| 1455 int32_t /* index */); | 1468 int32_t /* index */); |
| 1456 IPC_MESSAGE_CONTROL1(PpapiHostMsg_MediaStreamTrack_EnqueueBuffer, | 1469 IPC_MESSAGE_CONTROL1(PpapiHostMsg_MediaStreamTrack_EnqueueBuffer, |
| 1457 int32_t /* index */); | 1470 int32_t /* index */); |
| (...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2069 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, | 2082 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, |
| 2070 PP_TalkPermission /* permission */) | 2083 PP_TalkPermission /* permission */) |
| 2071 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) | 2084 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) |
| 2072 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) | 2085 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) |
| 2073 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) | 2086 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) |
| 2074 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) | 2087 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) |
| 2075 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) | 2088 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) |
| 2076 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) | 2089 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) |
| 2077 | 2090 |
| 2078 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) | 2091 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) |
| OLD | NEW |