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 #ifndef REMOTING_HOST_CHROMOTING_MESSAGES_H_ | 5 #ifndef REMOTING_HOST_CHROMOTING_MESSAGES_H_ |
6 #define REMOTING_HOST_CHROMOTING_MESSAGES_H_ | 6 #define REMOTING_HOST_CHROMOTING_MESSAGES_H_ |
7 | 7 |
8 #include "ipc/ipc_platform_file.h" | 8 #include "ipc/ipc_platform_file.h" |
9 #include "net/base/ip_endpoint.h" | 9 #include "net/base/ip_endpoint.h" |
10 #include "remoting/host/chromoting_param_traits.h" | 10 #include "remoting/host/chromoting_param_traits.h" |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
131 // Notifies the network process that a shared buffer has been created. | 131 // Notifies the network process that a shared buffer has been created. |
132 IPC_MESSAGE_CONTROL3(ChromotingDesktopNetworkMsg_CreateSharedBuffer, | 132 IPC_MESSAGE_CONTROL3(ChromotingDesktopNetworkMsg_CreateSharedBuffer, |
133 int /* id */, | 133 int /* id */, |
134 IPC::PlatformFileForTransit /* handle */, | 134 IPC::PlatformFileForTransit /* handle */, |
135 uint32 /* size */) | 135 uint32 /* size */) |
136 | 136 |
137 // Request the network process to stop using a shared buffer. | 137 // Request the network process to stop using a shared buffer. |
138 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_ReleaseSharedBuffer, | 138 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_ReleaseSharedBuffer, |
139 int /* id */) | 139 int /* id */) |
140 | 140 |
141 IPC_STRUCT_TRAITS_BEGIN(webrtc::MouseCursorShape) | 141 // Serialized webrtc::MouseCursor. |
142 IPC_STRUCT_TRAITS_MEMBER(size) | 142 IPC_STRUCT_BEGIN(SerializedMouseCursor) |
Sergey Ulanov
2013/12/03 21:47:28
You can make webrtc::MouseCursor serializable with
dcaiafa
2013/12/10 01:32:03
Done.
| |
143 IPC_STRUCT_TRAITS_MEMBER(hotspot) | 143 IPC_STRUCT_MEMBER(webrtc::DesktopSize, size) |
144 IPC_STRUCT_TRAITS_MEMBER(data) | 144 IPC_STRUCT_MEMBER(webrtc::DesktopVector, hotspot) |
145 IPC_STRUCT_TRAITS_END() | 145 IPC_STRUCT_MEMBER(std::string, data) |
146 IPC_STRUCT_END() | |
146 | 147 |
147 // Serialized webrtc::DesktopFrame. | 148 // Serialized webrtc::DesktopFrame. |
148 IPC_STRUCT_BEGIN(SerializedDesktopFrame) | 149 IPC_STRUCT_BEGIN(SerializedDesktopFrame) |
149 // ID of the shared memory buffer containing the pixels. | 150 // ID of the shared memory buffer containing the pixels. |
150 IPC_STRUCT_MEMBER(int, shared_buffer_id) | 151 IPC_STRUCT_MEMBER(int, shared_buffer_id) |
151 | 152 |
152 // Width of a single row of pixels in bytes. | 153 // Width of a single row of pixels in bytes. |
153 IPC_STRUCT_MEMBER(int, bytes_per_row) | 154 IPC_STRUCT_MEMBER(int, bytes_per_row) |
154 | 155 |
155 // Captured region. | 156 // Captured region. |
(...skipping 10 matching lines...) Expand all Loading... | |
166 | 167 |
167 // DPI for this frame. | 168 // DPI for this frame. |
168 IPC_STRUCT_MEMBER(webrtc::DesktopVector, dpi) | 169 IPC_STRUCT_MEMBER(webrtc::DesktopVector, dpi) |
169 IPC_STRUCT_END() | 170 IPC_STRUCT_END() |
170 | 171 |
171 // Notifies the network process that a shared buffer has been created. | 172 // Notifies the network process that a shared buffer has been created. |
172 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_CaptureCompleted, | 173 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_CaptureCompleted, |
173 SerializedDesktopFrame /* frame */ ) | 174 SerializedDesktopFrame /* frame */ ) |
174 | 175 |
175 // Carries a cursor share update from the desktop session agent to the client. | 176 // Carries a cursor share update from the desktop session agent to the client. |
176 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_CursorShapeChanged, | 177 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_MouseCursor, |
177 webrtc::MouseCursorShape /* cursor_shape */ ) | 178 SerializedMouseCursor /* cursor */ ) |
178 | 179 |
179 // Carries a clipboard event from the desktop session agent to the client. | 180 // Carries a clipboard event from the desktop session agent to the client. |
180 // |serialized_event| is a serialized protocol::ClipboardEvent. | 181 // |serialized_event| is a serialized protocol::ClipboardEvent. |
181 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_InjectClipboardEvent, | 182 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_InjectClipboardEvent, |
182 std::string /* serialized_event */ ) | 183 std::string /* serialized_event */ ) |
183 | 184 |
184 // Requests the network process to terminate the client session. | 185 // Requests the network process to terminate the client session. |
185 IPC_MESSAGE_CONTROL0(ChromotingDesktopNetworkMsg_DisconnectSession) | 186 IPC_MESSAGE_CONTROL0(ChromotingDesktopNetworkMsg_DisconnectSession) |
186 | 187 |
187 // Carries an audio packet from the desktop session agent to the client. | 188 // Carries an audio packet from the desktop session agent to the client. |
(...skipping 24 matching lines...) Expand all Loading... | |
212 std::string /* serialized_event */ ) | 213 std::string /* serialized_event */ ) |
213 | 214 |
214 // Carries a mouse event from the client to the desktop session agent. | 215 // Carries a mouse event from the client to the desktop session agent. |
215 // |serialized_event| is a serialized protocol::MouseEvent. | 216 // |serialized_event| is a serialized protocol::MouseEvent. |
216 IPC_MESSAGE_CONTROL1(ChromotingNetworkDesktopMsg_InjectMouseEvent, | 217 IPC_MESSAGE_CONTROL1(ChromotingNetworkDesktopMsg_InjectMouseEvent, |
217 std::string /* serialized_event */ ) | 218 std::string /* serialized_event */ ) |
218 | 219 |
219 // Changes the screen resolution in the desktop session. | 220 // Changes the screen resolution in the desktop session. |
220 IPC_MESSAGE_CONTROL1(ChromotingNetworkDesktopMsg_SetScreenResolution, | 221 IPC_MESSAGE_CONTROL1(ChromotingNetworkDesktopMsg_SetScreenResolution, |
221 remoting::ScreenResolution /* resolution */) | 222 remoting::ScreenResolution /* resolution */) |
OLD | NEW |