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

Side by Side Diff: webrtc/modules/video_render/ios/video_render_ios_impl.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, 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_MODULES_VIDEO_RENDER_IOS_VIDEO_RENDER_IOS_IMPL_H_ 11 #ifndef WEBRTC_MODULES_VIDEO_RENDER_IOS_VIDEO_RENDER_IOS_IMPL_H_
12 #define WEBRTC_MODULES_VIDEO_RENDER_IOS_VIDEO_RENDER_IOS_IMPL_H_ 12 #define WEBRTC_MODULES_VIDEO_RENDER_IOS_VIDEO_RENDER_IOS_IMPL_H_
13 13
14 #include <list> 14 #include <list>
15 #include <map> 15 #include <map>
16 #include <memory>
16 17
17 #include "webrtc/modules/video_render/i_video_render.h" 18 #include "webrtc/modules/video_render/i_video_render.h"
18 19
19 namespace webrtc { 20 namespace webrtc {
20 21
21 class VideoRenderIosGles20; 22 class VideoRenderIosGles20;
22 class CriticalSectionWrapper; 23 class CriticalSectionWrapper;
23 24
24 class VideoRenderIosImpl : IVideoRender { 25 class VideoRenderIosImpl : IVideoRender {
25 public: 26 public:
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 const float right, 92 const float right,
92 const float bottom); 93 const float bottom);
93 int32_t FullScreenRender(void* window, const bool enable); 94 int32_t FullScreenRender(void* window, const bool enable);
94 95
95 private: 96 private:
96 int32_t id_; 97 int32_t id_;
97 void* ptr_window_; 98 void* ptr_window_;
98 bool full_screen_; 99 bool full_screen_;
99 100
100 CriticalSectionWrapper* crit_sec_; 101 CriticalSectionWrapper* crit_sec_;
101 rtc::scoped_ptr<VideoRenderIosGles20> ptr_ios_render_; 102 std::unique_ptr<VideoRenderIosGles20> ptr_ios_render_;
102 }; 103 };
103 } // namespace webrtc 104 } // namespace webrtc
104 #endif // WEBRTC_MODULES_VIDEO_RENDER_IOS_VIDEO_RENDER_IOS_IMPL_H_ 105 #endif // WEBRTC_MODULES_VIDEO_RENDER_IOS_VIDEO_RENDER_IOS_IMPL_H_
OLDNEW
« no previous file with comments | « webrtc/modules/video_render/ios/video_render_ios_gles20.h ('k') | webrtc/modules/video_render/ios/video_render_ios_view.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698