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

Side by Side Diff: webrtc/modules/video_render/ios/video_render_ios_view.mm

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 #if !defined(__has_feature) || !__has_feature(objc_arc) 11 #if !defined(__has_feature) || !__has_feature(objc_arc)
12 #error "This file requires ARC support." 12 #error "This file requires ARC support."
13 #endif 13 #endif
14 14
15 #include <memory>
16
15 #include "webrtc/modules/video_render/ios/video_render_ios_view.h" 17 #include "webrtc/modules/video_render/ios/video_render_ios_view.h"
16 #include "webrtc/system_wrappers/include/trace.h" 18 #include "webrtc/system_wrappers/include/trace.h"
17 19
18 using namespace webrtc; 20 using namespace webrtc;
19 21
20 @implementation VideoRenderIosView { 22 @implementation VideoRenderIosView {
21 EAGLContext* _context; 23 EAGLContext* _context;
22 rtc::scoped_ptr<webrtc::OpenGles20> _gles_renderer20; 24 std::unique_ptr<webrtc::OpenGles20> _gles_renderer20;
23 int _frameBufferWidth; 25 int _frameBufferWidth;
24 int _frameBufferHeight; 26 int _frameBufferHeight;
25 unsigned int _defaultFrameBuffer; 27 unsigned int _defaultFrameBuffer;
26 unsigned int _colorRenderBuffer; 28 unsigned int _colorRenderBuffer;
27 } 29 }
28 30
29 @synthesize context = context_; 31 @synthesize context = context_;
30 32
31 + (Class)layerClass { 33 + (Class)layerClass {
32 return [CAEAGLLayer class]; 34 return [CAEAGLLayer class];
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 154
153 - (BOOL)setCoordinatesForZOrder:(const float)zOrder 155 - (BOOL)setCoordinatesForZOrder:(const float)zOrder
154 Left:(const float)left 156 Left:(const float)left
155 Top:(const float)top 157 Top:(const float)top
156 Right:(const float)right 158 Right:(const float)right
157 Bottom:(const float)bottom { 159 Bottom:(const float)bottom {
158 return _gles_renderer20->SetCoordinates(zOrder, left, top, right, bottom); 160 return _gles_renderer20->SetCoordinates(zOrder, left, top, right, bottom);
159 } 161 }
160 162
161 @end 163 @end
OLDNEW
« no previous file with comments | « webrtc/modules/video_render/ios/video_render_ios_impl.h ('k') | webrtc/modules/video_render/mac/video_render_agl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698