| 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 "remoting/capturer/mouse_cursor_shape.h" |
| 9 #include "third_party/skia/include/core/SkPoint.h" | 10 #include "third_party/skia/include/core/SkPoint.h" |
| 10 #include "third_party/skia/include/core/SkRect.h" | 11 #include "third_party/skia/include/core/SkRect.h" |
| 11 #include "third_party/skia/include/core/SkSize.h" | 12 #include "third_party/skia/include/core/SkSize.h" |
| 12 | 13 |
| 13 #endif // REMOTING_HOST_CHROMOTING_MESSAGES_H_ | 14 #endif // REMOTING_HOST_CHROMOTING_MESSAGES_H_ |
| 14 | 15 |
| 15 // Multiply-included message file, no traditional include guard. | 16 // Multiply-included message file, no traditional include guard. |
| 16 #include "ipc/ipc_message_macros.h" | 17 #include "ipc/ipc_message_macros.h" |
| 17 | 18 |
| 18 #define IPC_MESSAGE_START ChromotingMsgStart | 19 #define IPC_MESSAGE_START ChromotingMsgStart |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 IPC_STRUCT_TRAITS_MEMBER(fTop) | 121 IPC_STRUCT_TRAITS_MEMBER(fTop) |
| 121 IPC_STRUCT_TRAITS_MEMBER(fRight) | 122 IPC_STRUCT_TRAITS_MEMBER(fRight) |
| 122 IPC_STRUCT_TRAITS_MEMBER(fBottom) | 123 IPC_STRUCT_TRAITS_MEMBER(fBottom) |
| 123 IPC_STRUCT_TRAITS_END() | 124 IPC_STRUCT_TRAITS_END() |
| 124 | 125 |
| 125 IPC_STRUCT_TRAITS_BEGIN(SkISize) | 126 IPC_STRUCT_TRAITS_BEGIN(SkISize) |
| 126 IPC_STRUCT_TRAITS_MEMBER(fWidth) | 127 IPC_STRUCT_TRAITS_MEMBER(fWidth) |
| 127 IPC_STRUCT_TRAITS_MEMBER(fHeight) | 128 IPC_STRUCT_TRAITS_MEMBER(fHeight) |
| 128 IPC_STRUCT_TRAITS_END() | 129 IPC_STRUCT_TRAITS_END() |
| 129 | 130 |
| 131 IPC_STRUCT_TRAITS_BEGIN(remoting::MouseCursorShape) |
| 132 IPC_STRUCT_TRAITS_MEMBER(width) |
| 133 IPC_STRUCT_TRAITS_MEMBER(height) |
| 134 IPC_STRUCT_TRAITS_MEMBER(hotspot_x) |
| 135 IPC_STRUCT_TRAITS_MEMBER(hotspot_y) |
| 136 IPC_STRUCT_TRAITS_MEMBER(data) |
| 137 IPC_STRUCT_TRAITS_END() |
| 138 |
| 130 // Serialized CaptureData structure. | 139 // Serialized CaptureData structure. |
| 131 IPC_STRUCT_BEGIN(SerializedCapturedData) | 140 IPC_STRUCT_BEGIN(SerializedCapturedData) |
| 132 // ID of the shared memory buffer containing the pixels. | 141 // ID of the shared memory buffer containing the pixels. |
| 133 IPC_STRUCT_MEMBER(int, shared_buffer_id) | 142 IPC_STRUCT_MEMBER(int, shared_buffer_id) |
| 134 | 143 |
| 135 // Width of a single row of pixels in bytes. | 144 // Width of a single row of pixels in bytes. |
| 136 IPC_STRUCT_MEMBER(int, bytes_per_row) | 145 IPC_STRUCT_MEMBER(int, bytes_per_row) |
| 137 | 146 |
| 138 // Captured region. | 147 // Captured region. |
| 139 IPC_STRUCT_MEMBER(std::vector<SkIRect>, dirty_region) | 148 IPC_STRUCT_MEMBER(std::vector<SkIRect>, dirty_region) |
| (...skipping 12 matching lines...) Expand all Loading... |
| 152 | 161 |
| 153 // DPI for this frame. | 162 // DPI for this frame. |
| 154 IPC_STRUCT_MEMBER(SkIPoint, dpi) | 163 IPC_STRUCT_MEMBER(SkIPoint, dpi) |
| 155 IPC_STRUCT_END() | 164 IPC_STRUCT_END() |
| 156 | 165 |
| 157 // Notifies the network process that a shared buffer has been created. | 166 // Notifies the network process that a shared buffer has been created. |
| 158 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_CaptureCompleted, | 167 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_CaptureCompleted, |
| 159 SerializedCapturedData /* capture_data */ ) | 168 SerializedCapturedData /* capture_data */ ) |
| 160 | 169 |
| 161 // Carries a cursor share update from the desktop session agent to the client. | 170 // Carries a cursor share update from the desktop session agent to the client. |
| 162 // |serialized_cursor_shape| is a serialized protocol::CursorShapeInfo. | |
| 163 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_CursorShapeChanged, | 171 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_CursorShapeChanged, |
| 164 std::string /* serialized_cursor_shape */ ) | 172 remoting::MouseCursorShape /* cursor_shape */ ) |
| 165 | 173 |
| 166 // Carries a clipboard event from the desktop session agent to the client. | 174 // Carries a clipboard event from the desktop session agent to the client. |
| 167 // |serialized_event| is a serialized protocol::ClipboardEvent. | 175 // |serialized_event| is a serialized protocol::ClipboardEvent. |
| 168 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_InjectClipboardEvent, | 176 IPC_MESSAGE_CONTROL1(ChromotingDesktopNetworkMsg_InjectClipboardEvent, |
| 169 std::string /* serialized_event */ ) | 177 std::string /* serialized_event */ ) |
| 170 | 178 |
| 171 //----------------------------------------------------------------------------- | 179 //----------------------------------------------------------------------------- |
| 172 // Chromoting messages sent from the network to the desktop process. | 180 // Chromoting messages sent from the network to the desktop process. |
| 173 | 181 |
| 174 // Notifies the desktop process that the shared memory buffer has been mapped to | 182 // Notifies the desktop process that the shared memory buffer has been mapped to |
| (...skipping 14 matching lines...) Expand all Loading... |
| 189 | 197 |
| 190 // Carries a keyboard event from the client to the desktop session agent. | 198 // Carries a keyboard event from the client to the desktop session agent. |
| 191 // |serialized_event| is a serialized protocol::KeyEvent. | 199 // |serialized_event| is a serialized protocol::KeyEvent. |
| 192 IPC_MESSAGE_CONTROL1(ChromotingNetworkDesktopMsg_InjectKeyEvent, | 200 IPC_MESSAGE_CONTROL1(ChromotingNetworkDesktopMsg_InjectKeyEvent, |
| 193 std::string /* serialized_event */ ) | 201 std::string /* serialized_event */ ) |
| 194 | 202 |
| 195 // Carries a mouse event from the client to the desktop session agent. | 203 // Carries a mouse event from the client to the desktop session agent. |
| 196 // |serialized_event| is a serialized protocol::MouseEvent. | 204 // |serialized_event| is a serialized protocol::MouseEvent. |
| 197 IPC_MESSAGE_CONTROL1(ChromotingNetworkDesktopMsg_InjectMouseEvent, | 205 IPC_MESSAGE_CONTROL1(ChromotingNetworkDesktopMsg_InjectMouseEvent, |
| 198 std::string /* serialized_event */ ) | 206 std::string /* serialized_event */ ) |
| OLD | NEW |