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

Unified Diff: chromecast/renderer/media/hole_frame_factory.cc

Issue 1875623002: Convert //chromecast from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « chromecast/renderer/media/cma_renderer.cc ('k') | chromecast/renderer/media/media_channel_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/renderer/media/hole_frame_factory.cc
diff --git a/chromecast/renderer/media/hole_frame_factory.cc b/chromecast/renderer/media/hole_frame_factory.cc
index 63e4343b47ef0b1760e74ea9086bbc7296594f85..284e2c0ab2d419d696bf9d16dd72fb8bb6e573dc 100644
--- a/chromecast/renderer/media/hole_frame_factory.cc
+++ b/chromecast/renderer/media/hole_frame_factory.cc
@@ -18,8 +18,8 @@ HoleFrameFactory::HoleFrameFactory(
::media::GpuVideoAcceleratorFactories* gpu_factories)
: gpu_factories_(gpu_factories), texture_(0), image_id_(0) {
if (gpu_factories_) {
- scoped_ptr<::media::GpuVideoAcceleratorFactories::ScopedGLContextLock> lock(
- gpu_factories_->GetGLContextLock());
+ std::unique_ptr<::media::GpuVideoAcceleratorFactories::ScopedGLContextLock>
+ lock(gpu_factories_->GetGLContextLock());
CHECK(lock);
gpu::gles2::GLES2Interface* gl = lock->ContextGL();
@@ -41,8 +41,8 @@ HoleFrameFactory::HoleFrameFactory(
HoleFrameFactory::~HoleFrameFactory() {
if (texture_) {
- scoped_ptr<::media::GpuVideoAcceleratorFactories::ScopedGLContextLock> lock(
- gpu_factories_->GetGLContextLock());
+ std::unique_ptr<::media::GpuVideoAcceleratorFactories::ScopedGLContextLock>
+ lock(gpu_factories_->GetGLContextLock());
CHECK(lock);
gpu::gles2::GLES2Interface* gl = lock->ContextGL();
gl->BindTexture(GL_TEXTURE_2D, texture_);
« no previous file with comments | « chromecast/renderer/media/cma_renderer.cc ('k') | chromecast/renderer/media/media_channel_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698