webrtc/modules/desktop_capture/desktop_frame.cc - Issue 1803833002: Stop using some scoped_ptr features that unique_ptr doesn't have

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/desktop_frame.cc

Issue 1803833002: Stop using some scoped_ptr features that unique_ptr doesn't have (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: 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/base/optional_unittest.cc ('K') | « webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc ('k') | webrtc/modules/desktop_capture/screen_capturer_unittest.cc » ('j') | webrtc/p2p/base/dtlstransportchannel.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/desktop_capture/desktop_frame.cc

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

index 054427cb772425e9e58643ac5173b6f67887fbce..295d124f2966ffdd9e139802d15638ce3496b618 100644

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

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

@@ -88,7 +88,7 @@ rtc::scoped_ptr<DesktopFrame> SharedMemoryDesktopFrame::Create(

if (!shared_memory)

return nullptr;

- return rtc_make_scoped_ptr(new SharedMemoryDesktopFrame(

+ return rtc::scoped_ptr<DesktopFrame>(new SharedMemoryDesktopFrame(

size, size.width() * DesktopFrame::kBytesPerPixel,

std::move(shared_memory)));

}