Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Side by Side Diff: remoting/host/chromoting_messages.h

Issue 92473002: Use webrtc::MouseCursorMonitor for cursor shapes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix linux build Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « remoting/host/chromoting_host_unittest.cc ('k') | remoting/host/chromoting_param_traits.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 // Notifies the network process that a shared buffer has been created. 137 // Notifies the network process that a shared buffer has been created.
138 IPC_MESSAGE_CONTROL3(ChromotingDesktopNetworkMsg_CreateSharedBuffer, 138 IPC_MESSAGE_CONTROL3(ChromotingDesktopNetworkMsg_CreateSharedBuffer,
139 int /* id */, 139 int /* id */,
140 IPC::PlatformFileForTransit /* handle */, 140 IPC::PlatformFileForTransit /* handle */,
141 uint32 /* size */) 141 uint32 /* size */)
142 142
143 // Request the network process to stop using a shared buffer. 143 // Request the network process to stop using a shared buffer.
144 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_ReleaseSharedBuffer, 144 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_ReleaseSharedBuffer,
145 int /* id */) 145 int /* id */)
146 146
147 IPC_STRUCT_TRAITS_BEGIN(webrtc::MouseCursorShape)
148 IPC_STRUCT_TRAITS_MEMBER(size)
149 IPC_STRUCT_TRAITS_MEMBER(hotspot)
150 IPC_STRUCT_TRAITS_MEMBER(data)
151 IPC_STRUCT_TRAITS_END()
152
153 // Serialized webrtc::DesktopFrame. 147 // Serialized webrtc::DesktopFrame.
154 IPC_STRUCT_BEGIN(SerializedDesktopFrame) 148 IPC_STRUCT_BEGIN(SerializedDesktopFrame)
155 // ID of the shared memory buffer containing the pixels. 149 // ID of the shared memory buffer containing the pixels.
156 IPC_STRUCT_MEMBER(int, shared_buffer_id) 150 IPC_STRUCT_MEMBER(int, shared_buffer_id)
157 151
158 // Width of a single row of pixels in bytes. 152 // Width of a single row of pixels in bytes.
159 IPC_STRUCT_MEMBER(int, bytes_per_row) 153 IPC_STRUCT_MEMBER(int, bytes_per_row)
160 154
161 // Captured region. 155 // Captured region.
162 IPC_STRUCT_MEMBER(std::vector<webrtc::DesktopRect>, dirty_region) 156 IPC_STRUCT_MEMBER(std::vector<webrtc::DesktopRect>, dirty_region)
163 157
164 // Dimensions of the buffer in pixels. 158 // Dimensions of the buffer in pixels.
165 IPC_STRUCT_MEMBER(webrtc::DesktopSize, dimensions) 159 IPC_STRUCT_MEMBER(webrtc::DesktopSize, dimensions)
166 160
167 // Time spent in capture. Unit is in milliseconds. 161 // Time spent in capture. Unit is in milliseconds.
168 IPC_STRUCT_MEMBER(int, capture_time_ms) 162 IPC_STRUCT_MEMBER(int, capture_time_ms)
169 163
170 // Sequence number supplied by client for performance tracking. 164 // Sequence number supplied by client for performance tracking.
171 IPC_STRUCT_MEMBER(int64, client_sequence_number) 165 IPC_STRUCT_MEMBER(int64, client_sequence_number)
172 166
173 // DPI for this frame. 167 // DPI for this frame.
174 IPC_STRUCT_MEMBER(webrtc::DesktopVector, dpi) 168 IPC_STRUCT_MEMBER(webrtc::DesktopVector, dpi)
175 IPC_STRUCT_END() 169 IPC_STRUCT_END()
176 170
177 // Notifies the network process that a shared buffer has been created. 171 // Notifies the network process that a shared buffer has been created.
178 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_CaptureCompleted, 172 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_CaptureCompleted,
179 SerializedDesktopFrame /* frame */ ) 173 SerializedDesktopFrame /* frame */ )
180 174
181 // Carries a cursor share update from the desktop session agent to the client. 175 // Carries a cursor share update from the desktop session agent to the client.
182 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_CursorShapeChanged, 176 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_MouseCursor,
183 webrtc::MouseCursorShape /* cursor_shape */ ) 177 webrtc::MouseCursor /* cursor */ )
184 178
185 // Carries a clipboard event from the desktop session agent to the client. 179 // Carries a clipboard event from the desktop session agent to the client.
186 // |serialized_event| is a serialized protocol::ClipboardEvent. 180 // |serialized_event| is a serialized protocol::ClipboardEvent.
187 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_InjectClipboardEvent, 181 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_InjectClipboardEvent,
188 std::string /* serialized_event */ ) 182 std::string /* serialized_event */ )
189 183
190 // Requests the network process to terminate the client session. 184 // Requests the network process to terminate the client session.
191 IPC_MESSAGE_CONTROL0(ChromotingDesktopNetworkMsg_DisconnectSession) 185 IPC_MESSAGE_CONTROL0(ChromotingDesktopNetworkMsg_DisconnectSession)
192 186
193 // Carries an audio packet from the desktop session agent to the client. 187 // Carries an audio packet from the desktop session agent to the client.
(...skipping 29 matching lines...) Expand all
223 std::string /* serialized_event */ ) 217 std::string /* serialized_event */ )
224 218
225 // Carries a mouse event from the client to the desktop session agent. 219 // Carries a mouse event from the client to the desktop session agent.
226 // |serialized_event| is a serialized protocol::MouseEvent. 220 // |serialized_event| is a serialized protocol::MouseEvent.
227 IPC_MESSAGE_CONTROL1(ChromotingNetworkDesktopMsg_InjectMouseEvent, 221 IPC_MESSAGE_CONTROL1(ChromotingNetworkDesktopMsg_InjectMouseEvent,
228 std::string /* serialized_event */ ) 222 std::string /* serialized_event */ )
229 223
230 // Changes the screen resolution in the desktop session. 224 // Changes the screen resolution in the desktop session.
231 IPC_MESSAGE_CONTROL1(ChromotingNetworkDesktopMsg_SetScreenResolution, 225 IPC_MESSAGE_CONTROL1(ChromotingNetworkDesktopMsg_SetScreenResolution,
232 remoting::ScreenResolution /* resolution */) 226 remoting::ScreenResolution /* resolution */)
OLDNEW
« no previous file with comments | « remoting/host/chromoting_host_unittest.cc ('k') | remoting/host/chromoting_param_traits.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698