| Index: webrtc/modules/video_render/ios/video_render_ios_gles20.h
|
| diff --git a/webrtc/modules/video_render/ios/video_render_ios_gles20.h b/webrtc/modules/video_render/ios/video_render_ios_gles20.h
|
| index d703630d92143caf963db8735cf049c9142b5f75..d4e04e79d7374559a1195c3daa113c4a74557a45 100644
|
| --- a/webrtc/modules/video_render/ios/video_render_ios_gles20.h
|
| +++ b/webrtc/modules/video_render/ios/video_render_ios_gles20.h
|
| @@ -13,9 +13,9 @@
|
|
|
| #include <list>
|
| #include <map>
|
| +#include <memory>
|
|
|
| #include "webrtc/base/platform_thread.h"
|
| -#include "webrtc/base/scoped_ptr.h"
|
| #include "webrtc/modules/video_render/ios/video_render_ios_channel.h"
|
| #include "webrtc/modules/video_render/ios/video_render_ios_view.h"
|
|
|
| @@ -62,10 +62,10 @@ class VideoRenderIosGles20 {
|
| int SwapAndDisplayBuffers();
|
|
|
| private:
|
| - rtc::scoped_ptr<CriticalSectionWrapper> gles_crit_sec_;
|
| + std::unique_ptr<CriticalSectionWrapper> gles_crit_sec_;
|
| EventTimerWrapper* screen_update_event_;
|
| - // TODO(pbos): Remove scoped_ptr and use member directly.
|
| - rtc::scoped_ptr<rtc::PlatformThread> screen_update_thread_;
|
| + // TODO(pbos): Remove unique_ptr and use member directly.
|
| + std::unique_ptr<rtc::PlatformThread> screen_update_thread_;
|
|
|
| VideoRenderIosView* view_;
|
| Rect window_rect_;
|
|
|