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

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

Issue 1996753002: Fix DesktopSessioAgent crash when handling nullptr OnCaptureCompleted callback. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Share two --pending_capture_frame_requests_ calls Created 4 years, 6 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
« no previous file with comments | « no previous file | remoting/host/desktop_session_agent.cc » ('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_DESKTOP_SESSION_AGENT_H_ 5 #ifndef REMOTING_HOST_DESKTOP_SESSION_AGENT_H_
6 #define REMOTING_HOST_DESKTOP_SESSION_AGENT_H_ 6 #define REMOTING_HOST_DESKTOP_SESSION_AGENT_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 // Used to apply client-requested changes in screen resolution. 175 // Used to apply client-requested changes in screen resolution.
176 std::unique_ptr<ScreenControls> screen_controls_; 176 std::unique_ptr<ScreenControls> screen_controls_;
177 177
178 // IPC channel connecting the desktop process with the network process. 178 // IPC channel connecting the desktop process with the network process.
179 std::unique_ptr<IPC::ChannelProxy> network_channel_; 179 std::unique_ptr<IPC::ChannelProxy> network_channel_;
180 180
181 // The client end of the network-to-desktop pipe. It is kept alive until 181 // The client end of the network-to-desktop pipe. It is kept alive until
182 // the network process connects to the pipe. 182 // the network process connects to the pipe.
183 base::File desktop_pipe_; 183 base::File desktop_pipe_;
184 184
185 // Size of the most recent captured video frame.
186 webrtc::DesktopSize current_size_;
187
188 // True if the desktop session agent has been started. 185 // True if the desktop session agent has been started.
189 bool started_ = false; 186 bool started_ = false;
190 187
191 // Captures the screen. 188 // Captures the screen.
192 std::unique_ptr<webrtc::DesktopCapturer> video_capturer_; 189 std::unique_ptr<webrtc::DesktopCapturer> video_capturer_;
193 190
194 // Captures mouse shapes. 191 // Captures mouse shapes.
195 std::unique_ptr<webrtc::MouseCursorMonitor> mouse_cursor_monitor_; 192 std::unique_ptr<webrtc::MouseCursorMonitor> mouse_cursor_monitor_;
196 193
197 // Keep reference to the last frame sent to make sure shared buffer is alive 194 // Keep reference to the last frame sent to make sure shared buffer is alive
198 // before it's received. 195 // before it's received.
199 std::unique_ptr<webrtc::DesktopFrame> last_frame_; 196 std::unique_ptr<webrtc::DesktopFrame> last_frame_;
200 197
201 // Used to disable callbacks to |this|. 198 // Used to disable callbacks to |this|.
202 base::WeakPtrFactory<DesktopSessionAgent> weak_factory_; 199 base::WeakPtrFactory<DesktopSessionAgent> weak_factory_;
203 200
204 DISALLOW_COPY_AND_ASSIGN(DesktopSessionAgent); 201 DISALLOW_COPY_AND_ASSIGN(DesktopSessionAgent);
205 }; 202 };
206 203
207 } // namespace remoting 204 } // namespace remoting
208 205
209 #endif // REMOTING_HOST_DESKTOP_SESSION_AGENT_H_ 206 #endif // REMOTING_HOST_DESKTOP_SESSION_AGENT_H_
OLDNEW
« no previous file with comments | « no previous file | remoting/host/desktop_session_agent.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698