webrtc/modules/desktop_capture/window_capturer_win.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/window_capturer_win.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/shared_memory.h ('K') | « webrtc/modules/desktop_capture/window_capturer_unittest.cc ('k') | webrtc/modules/desktop_capture/window_capturer_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/desktop_capture/window_capturer_win.cc

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

index 9f0ca409def2bdba0415fe6d65f1a9a79fd6e857..0d594a2a096e56169f82d69d2f966883f53f414d 100644

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

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

@@ -12,7 +12,8 @@

#include <assert.h>

-#include "webrtc/base/scoped_ptr.h"

+#include <memory>

#include "webrtc/base/checks.h"

#include "webrtc/base/win32.h"

#include "webrtc/modules/desktop_capture/desktop_frame_win.h"

@@ -204,7 +205,7 @@ void WindowCapturerWin::Capture(const DesktopRegion& region) {

return;

}

- rtc::scoped_ptr<DesktopFrameWin> frame(

+ std::unique_ptr<DesktopFrameWin> frame(

DesktopFrameWin::Create(cropped_rect.size(), NULL, window_dc));

if (!frame.get()) {

ReleaseDC(window_, window_dc);