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

Side by Side Diff: webrtc/modules/desktop_capture/desktop_and_cursor_composer.h

Issue 2030333003: Revert of Use std::unique_ptr<> to pass frame ownership in DesktopCapturer impls. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 24 matching lines...) Expand all
35 35
36 // DesktopCapturer interface. 36 // DesktopCapturer interface.
37 void Start(DesktopCapturer::Callback* callback) override; 37 void Start(DesktopCapturer::Callback* callback) override;
38 void SetSharedMemoryFactory( 38 void SetSharedMemoryFactory(
39 std::unique_ptr<SharedMemoryFactory> shared_memory_factory) override; 39 std::unique_ptr<SharedMemoryFactory> shared_memory_factory) override;
40 void Capture(const DesktopRegion& region) override; 40 void Capture(const DesktopRegion& region) override;
41 void SetExcludedWindow(WindowId window) override; 41 void SetExcludedWindow(WindowId window) override;
42 42
43 private: 43 private:
44 // DesktopCapturer::Callback interface. 44 // DesktopCapturer::Callback interface.
45 void OnCaptureResult(DesktopCapturer::Result result, 45 void OnCaptureCompleted(DesktopFrame* frame) override;
46 std::unique_ptr<DesktopFrame> frame) override;
47 46
48 // MouseCursorMonitor::Callback interface. 47 // MouseCursorMonitor::Callback interface.
49 void OnMouseCursor(MouseCursor* cursor) override; 48 void OnMouseCursor(MouseCursor* cursor) override;
50 void OnMouseCursorPosition(MouseCursorMonitor::CursorState state, 49 void OnMouseCursorPosition(MouseCursorMonitor::CursorState state,
51 const DesktopVector& position) override; 50 const DesktopVector& position) override;
52 51
53 std::unique_ptr<DesktopCapturer> desktop_capturer_; 52 std::unique_ptr<DesktopCapturer> desktop_capturer_;
54 std::unique_ptr<MouseCursorMonitor> mouse_monitor_; 53 std::unique_ptr<MouseCursorMonitor> mouse_monitor_;
55 54
56 DesktopCapturer::Callback* callback_; 55 DesktopCapturer::Callback* callback_;
57 56
58 std::unique_ptr<MouseCursor> cursor_; 57 std::unique_ptr<MouseCursor> cursor_;
59 MouseCursorMonitor::CursorState cursor_state_; 58 MouseCursorMonitor::CursorState cursor_state_;
60 DesktopVector cursor_position_; 59 DesktopVector cursor_position_;
61 60
62 RTC_DISALLOW_COPY_AND_ASSIGN(DesktopAndCursorComposer); 61 RTC_DISALLOW_COPY_AND_ASSIGN(DesktopAndCursorComposer);
63 }; 62 };
64 63
65 } // namespace webrtc 64 } // namespace webrtc
66 65
67 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_ 66 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698