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

Side by Side Diff: webrtc/modules/desktop_capture/cropping_window_capturer.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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 void Capture(const DesktopRegion& region) override; 35 void Capture(const DesktopRegion& region) override;
36 void SetExcludedWindow(WindowId window) override; 36 void SetExcludedWindow(WindowId window) override;
37 37
38 // WindowCapturer implementation. 38 // WindowCapturer implementation.
39 bool GetWindowList(WindowList* windows) override; 39 bool GetWindowList(WindowList* windows) override;
40 bool SelectWindow(WindowId id) override; 40 bool SelectWindow(WindowId id) override;
41 bool BringSelectedWindowToFront() override; 41 bool BringSelectedWindowToFront() override;
42 42
43 // DesktopCapturer::Callback implementation, passed to |screen_capturer_| to 43 // DesktopCapturer::Callback implementation, passed to |screen_capturer_| to
44 // intercept the capture result. 44 // intercept the capture result.
45 void OnCaptureResult(DesktopCapturer::Result result, 45 void OnCaptureCompleted(DesktopFrame* frame) override;
46 std::unique_ptr<DesktopFrame> frame) override;
47 46
48 protected: 47 protected:
49 explicit CroppingWindowCapturer(const DesktopCaptureOptions& options); 48 explicit CroppingWindowCapturer(const DesktopCaptureOptions& options);
50 49
51 // The platform implementation should override these methods. 50 // The platform implementation should override these methods.
52 51
53 // Returns true if it is OK to capture the whole screen and crop to the 52 // Returns true if it is OK to capture the whole screen and crop to the
54 // selected window, i.e. the selected window is opaque, rectangular, and not 53 // selected window, i.e. the selected window is opaque, rectangular, and not
55 // occluded. 54 // occluded.
56 virtual bool ShouldUseScreenCapturer() = 0; 55 virtual bool ShouldUseScreenCapturer() = 0;
(...skipping 11 matching lines...) Expand all
68 std::unique_ptr<WindowCapturer> window_capturer_; 67 std::unique_ptr<WindowCapturer> window_capturer_;
69 std::unique_ptr<ScreenCapturer> screen_capturer_; 68 std::unique_ptr<ScreenCapturer> screen_capturer_;
70 WindowId selected_window_; 69 WindowId selected_window_;
71 WindowId excluded_window_; 70 WindowId excluded_window_;
72 }; 71 };
73 72
74 } // namespace webrtc 73 } // namespace webrtc
75 74
76 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_CROPPING_WINDOW_CAPTURER_H_ 75 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_CROPPING_WINDOW_CAPTURER_H_
77 76
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/cropped_desktop_frame.cc ('k') | webrtc/modules/desktop_capture/cropping_window_capturer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698