| 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 #include "ppapi/proxy/ppapi_proxy_export.h" | 56 #include "ppapi/proxy/ppapi_proxy_export.h" |
| 57 #include "ppapi/proxy/resource_message_params.h" | 57 #include "ppapi/proxy/resource_message_params.h" |
| 58 #include "ppapi/proxy/serialized_flash_menu.h" | 58 #include "ppapi/proxy/serialized_flash_menu.h" |
| 59 #include "ppapi/proxy/serialized_handle.h" | 59 #include "ppapi/proxy/serialized_handle.h" |
| 60 #include "ppapi/proxy/serialized_structs.h" | 60 #include "ppapi/proxy/serialized_structs.h" |
| 61 #include "ppapi/proxy/serialized_var.h" | 61 #include "ppapi/proxy/serialized_var.h" |
| 62 #include "ppapi/shared_impl/dir_contents.h" | 62 #include "ppapi/shared_impl/dir_contents.h" |
| 63 #include "ppapi/shared_impl/file_growth.h" | 63 #include "ppapi/shared_impl/file_growth.h" |
| 64 #include "ppapi/shared_impl/file_path.h" | 64 #include "ppapi/shared_impl/file_path.h" |
| 65 #include "ppapi/shared_impl/file_ref_create_info.h" | 65 #include "ppapi/shared_impl/file_ref_create_info.h" |
| 66 #include "ppapi/shared_impl/media_stream_audio_track_shared.h" |
| 66 #include "ppapi/shared_impl/media_stream_video_track_shared.h" | 67 #include "ppapi/shared_impl/media_stream_video_track_shared.h" |
| 67 #include "ppapi/shared_impl/ppapi_nacl_plugin_args.h" | 68 #include "ppapi/shared_impl/ppapi_nacl_plugin_args.h" |
| 68 #include "ppapi/shared_impl/ppapi_preferences.h" | 69 #include "ppapi/shared_impl/ppapi_preferences.h" |
| 69 #include "ppapi/shared_impl/ppb_device_ref_shared.h" | 70 #include "ppapi/shared_impl/ppb_device_ref_shared.h" |
| 70 #include "ppapi/shared_impl/ppb_input_event_shared.h" | 71 #include "ppapi/shared_impl/ppb_input_event_shared.h" |
| 71 #include "ppapi/shared_impl/ppb_tcp_socket_shared.h" | 72 #include "ppapi/shared_impl/ppb_tcp_socket_shared.h" |
| 72 #include "ppapi/shared_impl/ppb_view_shared.h" | 73 #include "ppapi/shared_impl/ppb_view_shared.h" |
| 73 #include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h" | 74 #include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h" |
| 74 #include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h" | 75 #include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h" |
| 75 #include "ppapi/shared_impl/socket_option_data.h" | 76 #include "ppapi/shared_impl/socket_option_data.h" |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 IPC_STRUCT_TRAITS_MEMBER(browser_pending_host_resource_id) | 238 IPC_STRUCT_TRAITS_MEMBER(browser_pending_host_resource_id) |
| 238 IPC_STRUCT_TRAITS_MEMBER(renderer_pending_host_resource_id) | 239 IPC_STRUCT_TRAITS_MEMBER(renderer_pending_host_resource_id) |
| 239 IPC_STRUCT_TRAITS_MEMBER(file_system_plugin_resource) | 240 IPC_STRUCT_TRAITS_MEMBER(file_system_plugin_resource) |
| 240 IPC_STRUCT_TRAITS_END() | 241 IPC_STRUCT_TRAITS_END() |
| 241 | 242 |
| 242 IPC_STRUCT_TRAITS_BEGIN(ppapi::FlashSiteSetting) | 243 IPC_STRUCT_TRAITS_BEGIN(ppapi::FlashSiteSetting) |
| 243 IPC_STRUCT_TRAITS_MEMBER(site) | 244 IPC_STRUCT_TRAITS_MEMBER(site) |
| 244 IPC_STRUCT_TRAITS_MEMBER(permission) | 245 IPC_STRUCT_TRAITS_MEMBER(permission) |
| 245 IPC_STRUCT_TRAITS_END() | 246 IPC_STRUCT_TRAITS_END() |
| 246 | 247 |
| 248 IPC_STRUCT_TRAITS_BEGIN(ppapi::MediaStreamAudioTrackShared::Attributes) |
| 249 IPC_STRUCT_TRAITS_MEMBER(buffers) |
| 250 IPC_STRUCT_TRAITS_END() |
| 251 |
| 247 IPC_STRUCT_TRAITS_BEGIN(ppapi::MediaStreamVideoTrackShared::Attributes) | 252 IPC_STRUCT_TRAITS_BEGIN(ppapi::MediaStreamVideoTrackShared::Attributes) |
| 248 IPC_STRUCT_TRAITS_MEMBER(buffers) | 253 IPC_STRUCT_TRAITS_MEMBER(buffers) |
| 249 IPC_STRUCT_TRAITS_MEMBER(width) | 254 IPC_STRUCT_TRAITS_MEMBER(width) |
| 250 IPC_STRUCT_TRAITS_MEMBER(height) | 255 IPC_STRUCT_TRAITS_MEMBER(height) |
| 251 IPC_STRUCT_TRAITS_MEMBER(format) | 256 IPC_STRUCT_TRAITS_MEMBER(format) |
| 252 IPC_STRUCT_TRAITS_END() | 257 IPC_STRUCT_TRAITS_END() |
| 253 | 258 |
| 254 IPC_STRUCT_TRAITS_BEGIN(ppapi::ViewData) | 259 IPC_STRUCT_TRAITS_BEGIN(ppapi::ViewData) |
| 255 IPC_STRUCT_TRAITS_MEMBER(rect) | 260 IPC_STRUCT_TRAITS_MEMBER(rect) |
| 256 IPC_STRUCT_TRAITS_MEMBER(is_fullscreen) | 261 IPC_STRUCT_TRAITS_MEMBER(is_fullscreen) |
| (...skipping 1180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1437 // IsolatedFileSystem | 1442 // IsolatedFileSystem |
| 1438 IPC_MESSAGE_CONTROL0(PpapiHostMsg_IsolatedFileSystem_Create) | 1443 IPC_MESSAGE_CONTROL0(PpapiHostMsg_IsolatedFileSystem_Create) |
| 1439 IPC_MESSAGE_CONTROL1(PpapiHostMsg_IsolatedFileSystem_BrowserOpen, | 1444 IPC_MESSAGE_CONTROL1(PpapiHostMsg_IsolatedFileSystem_BrowserOpen, |
| 1440 PP_IsolatedFileSystemType_Private /* type */) | 1445 PP_IsolatedFileSystemType_Private /* type */) |
| 1441 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_IsolatedFileSystem_BrowserOpenReply, | 1446 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_IsolatedFileSystem_BrowserOpenReply, |
| 1442 std::string /* fsid */) | 1447 std::string /* fsid */) |
| 1443 | 1448 |
| 1444 // MediaStream ----------------------------------------------------------------- | 1449 // MediaStream ----------------------------------------------------------------- |
| 1445 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_MediaStreamAudioTrack_CreateFromPendingHost, | 1450 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_MediaStreamAudioTrack_CreateFromPendingHost, |
| 1446 std::string /* track_id */) | 1451 std::string /* track_id */) |
| 1452 IPC_MESSAGE_CONTROL1( |
| 1453 PpapiHostMsg_MediaStreamAudioTrack_Configure, |
| 1454 ppapi::MediaStreamAudioTrackShared::Attributes /* attributes */) |
| 1455 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_MediaStreamAudioTrack_ConfigureReply) |
| 1447 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_MediaStreamVideoTrack_CreateFromPendingHost, | 1456 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_MediaStreamVideoTrack_CreateFromPendingHost, |
| 1448 std::string /* track_id */) | 1457 std::string /* track_id */) |
| 1449 IPC_MESSAGE_CONTROL0(PpapiHostMsg_MediaStreamVideoTrack_Create) | 1458 IPC_MESSAGE_CONTROL0(PpapiHostMsg_MediaStreamVideoTrack_Create) |
| 1450 IPC_MESSAGE_CONTROL1( | 1459 IPC_MESSAGE_CONTROL1( |
| 1451 PpapiHostMsg_MediaStreamVideoTrack_Configure, | 1460 PpapiHostMsg_MediaStreamVideoTrack_Configure, |
| 1452 ppapi::MediaStreamVideoTrackShared::Attributes /* attributes */) | 1461 ppapi::MediaStreamVideoTrackShared::Attributes /* attributes */) |
| 1453 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_MediaStreamVideoTrack_ConfigureReply, | 1462 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_MediaStreamVideoTrack_ConfigureReply, |
| 1454 std::string /* track_id */) | 1463 std::string /* track_id */) |
| 1455 | 1464 |
| 1456 // Message for init buffers. It also takes a shared memory handle which is put | 1465 // Message for init buffers. It also takes a shared memory handle which is put |
| (...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2162 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, | 2171 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, |
| 2163 PP_TalkPermission /* permission */) | 2172 PP_TalkPermission /* permission */) |
| 2164 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) | 2173 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) |
| 2165 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) | 2174 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) |
| 2166 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) | 2175 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) |
| 2167 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) | 2176 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) |
| 2168 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) | 2177 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) |
| 2169 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) | 2178 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) |
| 2170 | 2179 |
| 2171 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) | 2180 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) |
| OLD | NEW |