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

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

Issue 1924443002: Revert of Replace the remaining scoped_ptr with unique_ptr in webrtc/modules/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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
11 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_ 11 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_
12 #define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_ 12 #define WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_
13 13
14 #include <memory> 14 #include <memory>
15 15
16 #include "webrtc/base/constructormagic.h" 16 #include "webrtc/base/constructormagic.h"
17 #include "webrtc/base/scoped_ptr.h"
17 #include "webrtc/modules/desktop_capture/desktop_capturer.h" 18 #include "webrtc/modules/desktop_capture/desktop_capturer.h"
18 #include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h" 19 #include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h"
19 20
20 namespace webrtc { 21 namespace webrtc {
21 22
22 // A wrapper for DesktopCapturer that also captures mouse using specified 23 // A wrapper for DesktopCapturer that also captures mouse using specified
23 // MouseCursorMonitor and renders it on the generated streams. 24 // MouseCursorMonitor and renders it on the generated streams.
24 class DesktopAndCursorComposer : public DesktopCapturer, 25 class DesktopAndCursorComposer : public DesktopCapturer,
25 public DesktopCapturer::Callback, 26 public DesktopCapturer::Callback,
26 public MouseCursorMonitor::Callback { 27 public MouseCursorMonitor::Callback {
27 public: 28 public:
28 // Creates a new blender that captures mouse cursor using |mouse_monitor| and 29 // Creates a new blender that captures mouse cursor using |mouse_monitor| and
29 // renders it into the frames generated by |desktop_capturer|. If 30 // renders it into the frames generated by |desktop_capturer|. If
30 // |mouse_monitor| is NULL the frames are passed unmodified. Takes ownership 31 // |mouse_monitor| is NULL the frames are passed unmodified. Takes ownership
31 // of both arguments. 32 // of both arguments.
32 DesktopAndCursorComposer(DesktopCapturer* desktop_capturer, 33 DesktopAndCursorComposer(DesktopCapturer* desktop_capturer,
33 MouseCursorMonitor* mouse_monitor); 34 MouseCursorMonitor* mouse_monitor);
34 virtual ~DesktopAndCursorComposer(); 35 virtual ~DesktopAndCursorComposer();
35 36
36 // DesktopCapturer interface. 37 // DesktopCapturer interface.
37 void Start(DesktopCapturer::Callback* callback) override; 38 void Start(DesktopCapturer::Callback* callback) override;
38 void SetSharedMemoryFactory( 39 void SetSharedMemoryFactory(
39 std::unique_ptr<SharedMemoryFactory> shared_memory_factory) override; 40 rtc::scoped_ptr<SharedMemoryFactory> shared_memory_factory) override;
40 void Capture(const DesktopRegion& region) override; 41 void Capture(const DesktopRegion& region) override;
41 void SetExcludedWindow(WindowId window) override; 42 void SetExcludedWindow(WindowId window) override;
42 43
43 private: 44 private:
44 // DesktopCapturer::Callback interface. 45 // DesktopCapturer::Callback interface.
45 void OnCaptureCompleted(DesktopFrame* frame) override; 46 void OnCaptureCompleted(DesktopFrame* frame) override;
46 47
47 // MouseCursorMonitor::Callback interface. 48 // MouseCursorMonitor::Callback interface.
48 void OnMouseCursor(MouseCursor* cursor) override; 49 void OnMouseCursor(MouseCursor* cursor) override;
49 void OnMouseCursorPosition(MouseCursorMonitor::CursorState state, 50 void OnMouseCursorPosition(MouseCursorMonitor::CursorState state,
50 const DesktopVector& position) override; 51 const DesktopVector& position) override;
51 52
52 std::unique_ptr<DesktopCapturer> desktop_capturer_; 53 std::unique_ptr<DesktopCapturer> desktop_capturer_;
53 std::unique_ptr<MouseCursorMonitor> mouse_monitor_; 54 std::unique_ptr<MouseCursorMonitor> mouse_monitor_;
54 55
55 DesktopCapturer::Callback* callback_; 56 DesktopCapturer::Callback* callback_;
56 57
57 std::unique_ptr<MouseCursor> cursor_; 58 std::unique_ptr<MouseCursor> cursor_;
58 MouseCursorMonitor::CursorState cursor_state_; 59 MouseCursorMonitor::CursorState cursor_state_;
59 DesktopVector cursor_position_; 60 DesktopVector cursor_position_;
60 61
61 RTC_DISALLOW_COPY_AND_ASSIGN(DesktopAndCursorComposer); 62 RTC_DISALLOW_COPY_AND_ASSIGN(DesktopAndCursorComposer);
62 }; 63 };
63 64
64 } // namespace webrtc 65 } // namespace webrtc
65 66
66 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_ 67 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_AND_CURSOR_COMPOSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698