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

Issue 1988783003: Use std::unique_ptr<> to pass frame ownership in DesktopCapturer impls. (Closed)

Created:
4 years, 7 months ago by Sergey Ulanov
Modified:
4 years, 6 months ago
Reviewers:
Wez
CC:
webrtc-reviews_webrtc.org, tterriberry_mozilla.com
Base URL:
https://chromium.googlesource.com/external/webrtc.git@master
Target Ref:
refs/pending/heads/master
Project:
webrtc
Visibility:
Public.

Description

Use std::unique_ptr<> to pass frame ownership in DesktopCapturer impls. Previously raw pointers were used for owned DesktopFrame instances. Updated all screen and window capturer implementations to use std::unique_ptr<>. Also includes some other cleanups in the capturers: - s/NULL/nullptr - moved default initializers to class definition. BUG=webrtc:5950 Committed: https://crrev.com/5d910286e1e802245eec2cd76f5f8bef6e671e51 Cr-Commit-Position: refs/heads/master@{#13058}

Patch Set 1 : #

Total comments: 32

Patch Set 2 : #

Total comments: 8

Patch Set 3 : #

Patch Set 4 : #

Patch Set 5 : #

Patch Set 6 : #

Patch Set 7 : #

Unified diffs Side-by-side diffs Delta from patch set Stats (+386 lines, -447 lines) Patch
M webrtc/modules/desktop_capture/cropped_desktop_frame.h View 1 chunk +5 lines, -4 lines 0 comments Download
M webrtc/modules/desktop_capture/cropped_desktop_frame.cc View 2 chunks +12 lines, -11 lines 0 comments Download
M webrtc/modules/desktop_capture/cropping_window_capturer.h View 1 1 chunk +2 lines, -1 line 0 comments Download
M webrtc/modules/desktop_capture/cropping_window_capturer.cc View 1 1 chunk +9 lines, -9 lines 0 comments Download
M webrtc/modules/desktop_capture/desktop_and_cursor_composer.h View 1 1 chunk +2 lines, -1 line 0 comments Download
M webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc View 1 3 chunks +17 lines, -13 lines 0 comments Download
M webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc View 1 3 chunks +12 lines, -8 lines 0 comments Download
M webrtc/modules/desktop_capture/desktop_capturer.h View 1 2 1 chunk +26 lines, -5 lines 0 comments Download
M webrtc/modules/desktop_capture/desktop_frame_win.h View 1 1 chunk +3 lines, -3 lines 0 comments Download
M webrtc/modules/desktop_capture/desktop_frame_win.cc View 2 chunks +4 lines, -4 lines 0 comments Download
M webrtc/modules/desktop_capture/screen_capture_frame_queue.h View 1 chunk +2 lines, -2 lines 0 comments Download
M webrtc/modules/desktop_capture/screen_capturer_mac.mm View 1 2 3 4 5 19 chunks +45 lines, -62 lines 0 comments Download
M webrtc/modules/desktop_capture/screen_capturer_mac_unittest.cc View 1 2 3 4 5 6 2 chunks +17 lines, -12 lines 0 comments Download
M webrtc/modules/desktop_capture/screen_capturer_mock_objects.h View 1 1 chunk +7 lines, -1 line 0 comments Download
M webrtc/modules/desktop_capture/screen_capturer_unittest.cc View 1 6 chunks +16 lines, -14 lines 0 comments Download
M webrtc/modules/desktop_capture/screen_capturer_x11.cc View 1 2 3 4 5 10 chunks +34 lines, -48 lines 0 comments Download
M webrtc/modules/desktop_capture/shared_desktop_frame.h View 1 2 chunks +8 lines, -2 lines 0 comments Download
M webrtc/modules/desktop_capture/shared_desktop_frame.cc View 1 2 2 chunks +15 lines, -40 lines 0 comments Download
M webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h View 1 1 chunk +1 line, -3 lines 0 comments Download
M webrtc/modules/desktop_capture/win/screen_capturer_win_directx.cc View 1 2 3 4 5 9 chunks +30 lines, -32 lines 0 comments Download
M webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.h View 1 3 chunks +7 lines, -7 lines 0 comments Download
M webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc View 1 2 3 9 chunks +22 lines, -30 lines 0 comments Download
M webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h View 1 2 chunks +16 lines, -16 lines 0 comments Download
M webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc View 1 8 chunks +17 lines, -48 lines 0 comments Download
M webrtc/modules/desktop_capture/window_capturer_mac.mm View 1 2 3 4 5 9 chunks +16 lines, -19 lines 0 comments Download
M webrtc/modules/desktop_capture/window_capturer_null.cc View 1 2 chunks +4 lines, -8 lines 0 comments Download
M webrtc/modules/desktop_capture/window_capturer_unittest.cc View 1 1 chunk +4 lines, -1 line 0 comments Download
M webrtc/modules/desktop_capture/window_capturer_win.cc View 1 2 3 6 chunks +15 lines, -19 lines 0 comments Download
M webrtc/modules/desktop_capture/window_capturer_x11.cc View 1 2 3 4 5 8 chunks +18 lines, -24 lines 0 comments Download

Messages

Total messages: 56 (32 generated)
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1988783003/20001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1988783003/20001
4 years, 7 months ago (2016-05-17 22:57:07 UTC) #4
Sergey Ulanov
4 years, 7 months ago (2016-05-17 22:57:34 UTC) #7
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: android_dbg on tryserver.webrtc (JOB_FAILED, http://build.chromium.org/p/tryserver.webrtc/builders/android_dbg/builds/13396) android_rel on ...
4 years, 7 months ago (2016-05-17 22:59:38 UTC) #9
Wez
https://codereview.webrtc.org/1988783003/diff/20001/webrtc/modules/desktop_capture/cropped_desktop_frame.cc File webrtc/modules/desktop_capture/cropped_desktop_frame.cc (right): https://codereview.webrtc.org/1988783003/diff/20001/webrtc/modules/desktop_capture/cropped_desktop_frame.cc#newcode47 webrtc/modules/desktop_capture/cropped_desktop_frame.cc:47: frame_ = std::move(frame); Why does this need to be ...
4 years, 7 months ago (2016-05-18 01:29:51 UTC) #10
Sergey Ulanov
Addressed all comments. Also added DesktopCapture::Result to return result for each Capture() call. https://codereview.chromium.org/1988783003/diff/20001/webrtc/modules/desktop_capture/cropped_desktop_frame.cc File ...
4 years, 6 months ago (2016-05-31 12:02:49 UTC) #11
Wez
LGTM w/ nits. https://codereview.chromium.org/1988783003/diff/20001/webrtc/modules/desktop_capture/cropped_desktop_frame.cc File webrtc/modules/desktop_capture/cropped_desktop_frame.cc (right): https://codereview.chromium.org/1988783003/diff/20001/webrtc/modules/desktop_capture/cropped_desktop_frame.cc#newcode47 webrtc/modules/desktop_capture/cropped_desktop_frame.cc:47: frame_ = std::move(frame); On 2016/05/31 12:02:48, ...
4 years, 6 months ago (2016-06-01 21:29:05 UTC) #13
Sergey Ulanov
https://codereview.chromium.org/1988783003/diff/40001/webrtc/modules/desktop_capture/desktop_capturer.h File webrtc/modules/desktop_capture/desktop_capturer.h (right): https://codereview.chromium.org/1988783003/diff/40001/webrtc/modules/desktop_capture/desktop_capturer.h#newcode33 webrtc/modules/desktop_capture/desktop_capturer.h:33: // There was a temporary error. The caller should ...
4 years, 6 months ago (2016-06-03 08:14:31 UTC) #14
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1988783003/60001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1988783003/60001
4 years, 6 months ago (2016-06-03 08:14:48 UTC) #17
commit-bot: I haz the power
Try jobs failed on following builders: mac_baremetal on tryserver.webrtc (JOB_FAILED, http://build.chromium.org/p/tryserver.webrtc/builders/mac_baremetal/builds/11864)
4 years, 6 months ago (2016-06-03 08:18:42 UTC) #19
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1988783003/80001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1988783003/80001
4 years, 6 months ago (2016-06-03 09:04:48 UTC) #22
commit-bot: I haz the power
Try jobs failed on following builders: mac_baremetal on tryserver.webrtc (JOB_FAILED, http://build.chromium.org/p/tryserver.webrtc/builders/mac_baremetal/builds/11867) mac_gn_dbg on tryserver.webrtc (JOB_FAILED, ...
4 years, 6 months ago (2016-06-03 09:06:59 UTC) #24
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1988783003/100001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1988783003/100001
4 years, 6 months ago (2016-06-03 09:17:38 UTC) #27
commit-bot: I haz the power
Try jobs failed on following builders: mac_baremetal on tryserver.webrtc (JOB_FAILED, http://build.chromium.org/p/tryserver.webrtc/builders/mac_baremetal/builds/11868) mac_rel on tryserver.webrtc (JOB_FAILED, ...
4 years, 6 months ago (2016-06-03 09:19:30 UTC) #29
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1988783003/120001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1988783003/120001
4 years, 6 months ago (2016-06-03 09:35:51 UTC) #32
commit-bot: I haz the power
Try jobs failed on following builders: mac_rel on tryserver.webrtc (JOB_FAILED, http://build.chromium.org/p/tryserver.webrtc/builders/mac_rel/builds/15657) win_x64_clang_dbg on tryserver.webrtc (JOB_FAILED, ...
4 years, 6 months ago (2016-06-03 09:39:12 UTC) #34
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1988783003/140001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1988783003/140001
4 years, 6 months ago (2016-06-03 10:55:44 UTC) #37
commit-bot: I haz the power
Committed patchset #7 (id:140001)
4 years, 6 months ago (2016-06-03 12:15:29 UTC) #39
commit-bot: I haz the power
Patchset 7 (id:??) landed as https://crrev.com/4a627a8c13554d12412cabb8f751caee6e61ee32 Cr-Commit-Position: refs/heads/master@{#13032}
4 years, 6 months ago (2016-06-03 12:15:38 UTC) #41
Sergey Ulanov
A revert of this CL (patchset #7 id:140001) has been created in https://codereview.webrtc.org/2030333003/ by sergeyu@chromium.org. ...
4 years, 6 months ago (2016-06-03 12:56:30 UTC) #42
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1988783003/160001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1988783003/160001
4 years, 6 months ago (2016-06-03 13:00:16 UTC) #46
commit-bot: I haz the power
Try jobs failed on following builders: linux_rel on tryserver.webrtc (JOB_FAILED, http://build.chromium.org/p/tryserver.webrtc/builders/linux_rel/builds/15694) linux_ubsan_vptr on tryserver.webrtc (JOB_FAILED, ...
4 years, 6 months ago (2016-06-03 13:02:55 UTC) #48
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1988783003/140001
4 years, 6 months ago (2016-06-07 23:09:28 UTC) #52
commit-bot: I haz the power
Committed patchset #7 (id:140001)
4 years, 6 months ago (2016-06-07 23:42:05 UTC) #54
commit-bot: I haz the power
4 years, 6 months ago (2016-06-07 23:42:17 UTC) #56
Message was sent while issue was closed.
Patchset 7 (id:??) landed as
https://crrev.com/5d910286e1e802245eec2cd76f5f8bef6e671e51
Cr-Commit-Position: refs/heads/master@{#13058}

Powered by Google App Engine
This is Rietveld 408576698