| 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 1828 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1839 uint32_t /* shm_size */) | 1839 uint32_t /* shm_size */) |
| 1840 // On success, a shm handle is passed in the ReplyParams struct. | 1840 // On success, a shm handle is passed in the ReplyParams struct. |
| 1841 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoDecoder_GetShmReply, | 1841 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoDecoder_GetShmReply, |
| 1842 uint32_t /* shm_size */) | 1842 uint32_t /* shm_size */) |
| 1843 IPC_MESSAGE_CONTROL3(PpapiHostMsg_VideoDecoder_Decode, | 1843 IPC_MESSAGE_CONTROL3(PpapiHostMsg_VideoDecoder_Decode, |
| 1844 uint32_t /* shm_id */, | 1844 uint32_t /* shm_id */, |
| 1845 uint32_t /* size */, | 1845 uint32_t /* size */, |
| 1846 int32_t /* decode_id */) | 1846 int32_t /* decode_id */) |
| 1847 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoDecoder_DecodeReply, | 1847 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoDecoder_DecodeReply, |
| 1848 uint32_t /* shm_id */) | 1848 uint32_t /* shm_id */) |
| 1849 IPC_MESSAGE_CONTROL3(PpapiPluginMsg_VideoDecoder_RequestTextures, | 1849 IPC_MESSAGE_CONTROL4(PpapiPluginMsg_VideoDecoder_RequestTextures, |
| 1850 uint32_t /* num_textures */, | 1850 uint32_t /* num_textures */, |
| 1851 PP_Size /* size */, | 1851 PP_Size /* size */, |
| 1852 uint32_t /* texture_target */) | 1852 uint32_t /* texture_target */, |
| 1853 std::vector<gpu::Mailbox> /* mailboxes*/) |
| 1853 IPC_MESSAGE_CONTROL2(PpapiHostMsg_VideoDecoder_AssignTextures, | 1854 IPC_MESSAGE_CONTROL2(PpapiHostMsg_VideoDecoder_AssignTextures, |
| 1854 PP_Size /* size */, | 1855 PP_Size /* size */, |
| 1855 std::vector<uint32_t> /* texture_ids */) | 1856 std::vector<uint32_t> /* texture_ids */) |
| 1856 IPC_MESSAGE_CONTROL2(PpapiPluginMsg_VideoDecoder_PictureReady, | 1857 IPC_MESSAGE_CONTROL2(PpapiPluginMsg_VideoDecoder_PictureReady, |
| 1857 int32_t /* decode_id */, | 1858 int32_t /* decode_id */, |
| 1858 uint32_t /* texture_id */) | 1859 uint32_t /* texture_id */) |
| 1859 IPC_MESSAGE_CONTROL1(PpapiHostMsg_VideoDecoder_RecyclePicture, | 1860 IPC_MESSAGE_CONTROL1(PpapiHostMsg_VideoDecoder_RecyclePicture, |
| 1860 uint32_t /* texture_id */) | 1861 uint32_t /* texture_id */) |
| 1861 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoDecoder_DismissPicture, | 1862 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoDecoder_DismissPicture, |
| 1862 uint32_t /* texture_id */) | 1863 uint32_t /* texture_id */) |
| (...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2171 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, | 2172 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, |
| 2172 PP_TalkPermission /* permission */) | 2173 PP_TalkPermission /* permission */) |
| 2173 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) | 2174 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) |
| 2174 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) | 2175 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) |
| 2175 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) | 2176 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) |
| 2176 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) | 2177 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) |
| 2177 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) | 2178 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) |
| 2178 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) | 2179 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) |
| 2179 | 2180 |
| 2180 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) | 2181 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) |
| OLD | NEW |