webrtc/modules/video_render/mac/video_render_agl.h - Issue 1738863002: Replace scoped_ptr with unique_ptr in webrtc/modules/video_*/

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/video_render/mac/video_render_agl.h

Issue 1738863002: Replace scoped_ptr with unique_ptr in webrtc/modules/video_*/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up4

Patch Set: rebase Created 4 years, 10 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

« no previous file with comments | « webrtc/modules/video_render/ios/video_render_ios_view.mm ('k') | webrtc/modules/video_render/mac/video_render_nsopengl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/video_render/mac/video_render_agl.h

diff --git a/webrtc/modules/video_render/mac/video_render_agl.h b/webrtc/modules/video_render/mac/video_render_agl.h

index e1da8faf83b81da6c58944f9185b366631920545..c0a60597e98613d22ba1581a096cbd46e02f5466 100644

--- a/webrtc/modules/video_render/mac/video_render_agl.h

+++ b/webrtc/modules/video_render/mac/video_render_agl.h

@@ -29,6 +29,7 @@

#include <OpenGL/glu.h>

#include <list>

#include <map>

+#include <memory>

class VideoRenderAGL;

@@ -142,8 +143,8 @@ class VideoRenderAGL {

bool _fullScreen;

int _id;

webrtc::CriticalSectionWrapper& _renderCritSec;

- // TODO(pbos): Remove scoped_ptr and use PlatformThread directly.

- rtc::scoped_ptr<rtc::PlatformThread> _screenUpdateThread;

+ // TODO(pbos): Remove unique_ptr and use PlatformThread directly.

+ std::unique_ptr<rtc::PlatformThread> _screenUpdateThread;

webrtc::EventWrapper* _screenUpdateEvent;

bool _isHIViewRef;

AGLContext _aglContext;