| 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 1819 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1830 uint32_t /* shm_size */) | 1830 uint32_t /* shm_size */) |
| 1831 // On success, a shm handle is passed in the ReplyParams struct. | 1831 // On success, a shm handle is passed in the ReplyParams struct. |
| 1832 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoDecoder_GetShmReply, | 1832 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoDecoder_GetShmReply, |
| 1833 uint32_t /* shm_size */) | 1833 uint32_t /* shm_size */) |
| 1834 IPC_MESSAGE_CONTROL3(PpapiHostMsg_VideoDecoder_Decode, | 1834 IPC_MESSAGE_CONTROL3(PpapiHostMsg_VideoDecoder_Decode, |
| 1835 uint32_t /* shm_id */, | 1835 uint32_t /* shm_id */, |
| 1836 uint32_t /* size */, | 1836 uint32_t /* size */, |
| 1837 int32_t /* decode_id */) | 1837 int32_t /* decode_id */) |
| 1838 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoDecoder_DecodeReply, | 1838 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoDecoder_DecodeReply, |
| 1839 uint32_t /* shm_id */) | 1839 uint32_t /* shm_id */) |
| 1840 IPC_MESSAGE_CONTROL3(PpapiPluginMsg_VideoDecoder_RequestTextures, | 1840 IPC_MESSAGE_CONTROL4(PpapiPluginMsg_VideoDecoder_RequestTextures, |
| 1841 uint32_t /* num_textures */, | 1841 uint32_t /* num_textures */, |
| 1842 PP_Size /* size */, | 1842 PP_Size /* size */, |
| 1843 uint32_t /* texture_target */) | 1843 uint32_t /* texture_target */, |
| 1844 std::vector<gpu::Mailbox> /* mailboxes*/) |
| 1844 IPC_MESSAGE_CONTROL2(PpapiHostMsg_VideoDecoder_AssignTextures, | 1845 IPC_MESSAGE_CONTROL2(PpapiHostMsg_VideoDecoder_AssignTextures, |
| 1845 PP_Size /* size */, | 1846 PP_Size /* size */, |
| 1846 std::vector<uint32_t> /* texture_ids */) | 1847 std::vector<uint32_t> /* texture_ids */) |
| 1847 IPC_MESSAGE_CONTROL2(PpapiPluginMsg_VideoDecoder_PictureReady, | 1848 IPC_MESSAGE_CONTROL2(PpapiPluginMsg_VideoDecoder_PictureReady, |
| 1848 int32_t /* decode_id */, | 1849 int32_t /* decode_id */, |
| 1849 uint32_t /* texture_id */) | 1850 uint32_t /* texture_id */) |
| 1850 IPC_MESSAGE_CONTROL1(PpapiHostMsg_VideoDecoder_RecyclePicture, | 1851 IPC_MESSAGE_CONTROL1(PpapiHostMsg_VideoDecoder_RecyclePicture, |
| 1851 uint32_t /* texture_id */) | 1852 uint32_t /* texture_id */) |
| 1852 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoDecoder_DismissPicture, | 1853 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoDecoder_DismissPicture, |
| 1853 uint32_t /* texture_id */) | 1854 uint32_t /* texture_id */) |
| (...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2162 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, | 2163 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, |
| 2163 PP_TalkPermission /* permission */) | 2164 PP_TalkPermission /* permission */) |
| 2164 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) | 2165 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) |
| 2165 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) | 2166 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) |
| 2166 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) | 2167 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) |
| 2167 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) | 2168 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) |
| 2168 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) | 2169 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) |
| 2169 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) | 2170 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) |
| 2170 | 2171 |
| 2171 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) | 2172 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) |
| OLD | NEW |