webrtc/modules/desktop_capture/cropping_window_capturer.cc - Issue 1743203002: Replace scoped_ptr with unique_ptr in webrtc/modules/desktop_capture/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/desktop_capture/cropping_window_capturer.cc

Issue 1743203002: Replace scoped_ptr with unique_ptr in webrtc/modules/desktop_capture/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: More Windows reverts Created 4 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 side-by-side diff with in-line comments

Download patch

« webrtc/modules/desktop_capture/cropping_window_capturer.h ('K') | « webrtc/modules/desktop_capture/cropping_window_capturer.h ('k') | webrtc/modules/desktop_capture/desktop_and_cursor_composer.h » ('j') | webrtc/modules/desktop_capture/shared_memory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/desktop_capture/cropping_window_capturer.cc

diff --git a/webrtc/modules/desktop_capture/cropping_window_capturer.cc b/webrtc/modules/desktop_capture/cropping_window_capturer.cc

index 7aab7f8e3c07fc4b0620d920ff7a10c5dea9c087..0dd564f17058da883a53cea2a6e622a2def7153f 100644

--- a/webrtc/modules/desktop_capture/cropping_window_capturer.cc

+++ b/webrtc/modules/desktop_capture/cropping_window_capturer.cc

@@ -75,7 +75,7 @@ bool CroppingWindowCapturer::BringSelectedWindowToFront() {

}

void CroppingWindowCapturer::OnCaptureCompleted(DesktopFrame* frame) {

- rtc::scoped_ptr<DesktopFrame> screen_frame(frame);

+ std::unique_ptr<DesktopFrame> screen_frame(frame);

if (!ShouldUseScreenCapturer()) {

LOG(LS_INFO) << "Window no longer on top when ScreenCapturer finishes";

@@ -96,7 +96,7 @@ void CroppingWindowCapturer::OnCaptureCompleted(DesktopFrame* frame) {

return;

}

- rtc::scoped_ptr<DesktopFrame> window_frame(

+ std::unique_ptr<DesktopFrame> window_frame(

CreateCroppedDesktopFrame(screen_frame.release(), window_rect));

callback_->OnCaptureCompleted(window_frame.release());

}