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

Side by Side Diff: webrtc/modules/desktop_capture/desktop_capturer.cc

Issue 2754403002: Fix DesktopCapturer constructors to handle failures properly. (Closed)
Patch Set: Created 3 years, 9 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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 20 matching lines...) Expand all
31 } 31 }
32 32
33 bool DesktopCapturer::FocusOnSelectedSource() { 33 bool DesktopCapturer::FocusOnSelectedSource() {
34 return false; 34 return false;
35 } 35 }
36 36
37 // static 37 // static
38 std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateWindowCapturer( 38 std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateWindowCapturer(
39 const DesktopCaptureOptions& options) { 39 const DesktopCaptureOptions& options) {
40 std::unique_ptr<DesktopCapturer> capturer = CreateRawWindowCapturer(options); 40 std::unique_ptr<DesktopCapturer> capturer = CreateRawWindowCapturer(options);
41 if (options.detect_updated_region()) { 41 if (capturer && options.detect_updated_region()) {
42 capturer.reset(new DesktopCapturerDifferWrapper(std::move(capturer))); 42 capturer.reset(new DesktopCapturerDifferWrapper(std::move(capturer)));
43 } 43 }
44 44
45 return capturer; 45 return capturer;
46 } 46 }
47 47
48 // static 48 // static
49 std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateScreenCapturer( 49 std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateScreenCapturer(
50 const DesktopCaptureOptions& options) { 50 const DesktopCaptureOptions& options) {
51 std::unique_ptr<DesktopCapturer> capturer = CreateRawScreenCapturer(options); 51 std::unique_ptr<DesktopCapturer> capturer = CreateRawScreenCapturer(options);
52 if (options.detect_updated_region()) { 52 if (capturer && options.detect_updated_region()) {
53 capturer.reset(new DesktopCapturerDifferWrapper(std::move(capturer))); 53 capturer.reset(new DesktopCapturerDifferWrapper(std::move(capturer)));
54 } 54 }
55 55
56 return capturer; 56 return capturer;
57 } 57 }
58 58
59 } // namespace webrtc 59 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698