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 1429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1440 PP_IsolatedFileSystemType_Private /* type */) | 1440 PP_IsolatedFileSystemType_Private /* type */) |
| 1441 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_IsolatedFileSystem_BrowserOpenReply, | 1441 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_IsolatedFileSystem_BrowserOpenReply, |
| 1442 std::string /* fsid */) | 1442 std::string /* fsid */) |
| 1443 | 1443 |
| 1444 // MediaStream ----------------------------------------------------------------- | 1444 // MediaStream ----------------------------------------------------------------- |
| 1445 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_MediaStreamAudioTrack_CreateFromPendingHost, | 1445 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_MediaStreamAudioTrack_CreateFromPendingHost, |
| 1446 std::string /* track_id */) | 1446 std::string /* track_id */) |
| 1447 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_MediaStreamVideoTrack_CreateFromPendingHost, | 1447 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_MediaStreamVideoTrack_CreateFromPendingHost, |
| 1448 std::string /* track_id */) | 1448 std::string /* track_id */) |
| 1449 | 1449 |
| 1450 // Message for init frames. It also takes a shared memory handle which is put in | 1450 // Message for init buffers. It also takes a shared memory handle which is put |
| 1451 // the outer ResourceReplyMessage. | 1451 // in the outer ResourceReplyMessage. |
| 1452 IPC_MESSAGE_CONTROL2(PpapiPluginMsg_MediaStreamTrack_InitFrames, | 1452 IPC_MESSAGE_CONTROL2(PpapiPluginMsg_MediaStreamTrack_InitBuffers, |
| 1453 int32_t /* number_of_frames */, | 1453 int32_t /* number_of_frames */, |
|
yzshen1
2014/02/07 20:09:52
Do you want to also change this and the line below
Peng
2014/02/07 20:30:01
Done.
| |
| 1454 int32_t /* frame_size */) | 1454 int32_t /* frame_size */) |
| 1455 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_MediaStreamTrack_EnqueueFrame, | 1455 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_MediaStreamTrack_EnqueueBuffer, |
| 1456 int32_t /* index */); | 1456 int32_t /* index */); |
| 1457 IPC_MESSAGE_CONTROL1(PpapiHostMsg_MediaStreamTrack_EnqueueFrame, | 1457 IPC_MESSAGE_CONTROL1(PpapiHostMsg_MediaStreamTrack_EnqueueBuffer, |
| 1458 int32_t /* index */); | 1458 int32_t /* index */); |
| 1459 IPC_MESSAGE_CONTROL0(PpapiHostMsg_MediaStreamTrack_Close) | 1459 IPC_MESSAGE_CONTROL0(PpapiHostMsg_MediaStreamTrack_Close) |
| 1460 | 1460 |
| 1461 // NetworkMonitor. | 1461 // NetworkMonitor. |
| 1462 IPC_MESSAGE_CONTROL0(PpapiHostMsg_NetworkMonitor_Create) | 1462 IPC_MESSAGE_CONTROL0(PpapiHostMsg_NetworkMonitor_Create) |
| 1463 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_NetworkMonitor_NetworkList, | 1463 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_NetworkMonitor_NetworkList, |
| 1464 ppapi::proxy::SerializedNetworkList /* network_list */) | 1464 ppapi::proxy::SerializedNetworkList /* network_list */) |
| 1465 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_NetworkMonitor_Forbidden) | 1465 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_NetworkMonitor_Forbidden) |
| 1466 | 1466 |
| 1467 // NetworkProxy ---------------------------------------------------------------- | 1467 // NetworkProxy ---------------------------------------------------------------- |
| (...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2070 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, | 2070 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, |
| 2071 PP_TalkPermission /* permission */) | 2071 PP_TalkPermission /* permission */) |
| 2072 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) | 2072 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) |
| 2073 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) | 2073 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) |
| 2074 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) | 2074 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) |
| 2075 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) | 2075 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) |
| 2076 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) | 2076 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) |
| 2077 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) | 2077 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) |
| 2078 | 2078 |
| 2079 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) | 2079 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) |
| OLD | NEW |