| 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 1843 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1854 uint32_t /* shm_size */) | 1854 uint32_t /* shm_size */) |
| 1855 // On success, a shm handle is passed in the ReplyParams struct. | 1855 // On success, a shm handle is passed in the ReplyParams struct. |
| 1856 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoDecoder_GetShmReply, | 1856 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoDecoder_GetShmReply, |
| 1857 uint32_t /* shm_size */) | 1857 uint32_t /* shm_size */) |
| 1858 IPC_MESSAGE_CONTROL3(PpapiHostMsg_VideoDecoder_Decode, | 1858 IPC_MESSAGE_CONTROL3(PpapiHostMsg_VideoDecoder_Decode, |
| 1859 uint32_t /* shm_id */, | 1859 uint32_t /* shm_id */, |
| 1860 uint32_t /* size */, | 1860 uint32_t /* size */, |
| 1861 int32_t /* decode_id */) | 1861 int32_t /* decode_id */) |
| 1862 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoDecoder_DecodeReply, | 1862 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoDecoder_DecodeReply, |
| 1863 uint32_t /* shm_id */) | 1863 uint32_t /* shm_id */) |
| 1864 IPC_MESSAGE_CONTROL3(PpapiPluginMsg_VideoDecoder_RequestTextures, | 1864 IPC_MESSAGE_CONTROL4(PpapiPluginMsg_VideoDecoder_RequestTextures, |
| 1865 uint32_t /* num_textures */, | 1865 uint32_t /* num_textures */, |
| 1866 PP_Size /* size */, | 1866 PP_Size /* size */, |
| 1867 uint32_t /* texture_target */) | 1867 uint32_t /* texture_target */, |
| 1868 std::vector<gpu::Mailbox> /* mailboxes*/) |
| 1868 IPC_MESSAGE_CONTROL2(PpapiHostMsg_VideoDecoder_AssignTextures, | 1869 IPC_MESSAGE_CONTROL2(PpapiHostMsg_VideoDecoder_AssignTextures, |
| 1869 PP_Size /* size */, | 1870 PP_Size /* size */, |
| 1870 std::vector<uint32_t> /* texture_ids */) | 1871 std::vector<uint32_t> /* texture_ids */) |
| 1871 IPC_MESSAGE_CONTROL2(PpapiPluginMsg_VideoDecoder_PictureReady, | 1872 IPC_MESSAGE_CONTROL2(PpapiPluginMsg_VideoDecoder_PictureReady, |
| 1872 int32_t /* decode_id */, | 1873 int32_t /* decode_id */, |
| 1873 uint32_t /* texture_id */) | 1874 uint32_t /* texture_id */) |
| 1874 IPC_MESSAGE_CONTROL1(PpapiHostMsg_VideoDecoder_RecyclePicture, | 1875 IPC_MESSAGE_CONTROL1(PpapiHostMsg_VideoDecoder_RecyclePicture, |
| 1875 uint32_t /* texture_id */) | 1876 uint32_t /* texture_id */) |
| 1876 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoDecoder_DismissPicture, | 1877 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoDecoder_DismissPicture, |
| 1877 uint32_t /* texture_id */) | 1878 uint32_t /* texture_id */) |
| (...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2186 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, | 2187 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, |
| 2187 PP_TalkPermission /* permission */) | 2188 PP_TalkPermission /* permission */) |
| 2188 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) | 2189 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) |
| 2189 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) | 2190 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) |
| 2190 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) | 2191 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) |
| 2191 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) | 2192 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) |
| 2192 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) | 2193 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) |
| 2193 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) | 2194 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) |
| 2194 | 2195 |
| 2195 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) | 2196 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) |
| OLD | NEW |