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

Unified Diff: ppapi/proxy/video_decoder_resource.cc

Issue 1864293002: Convert //ppapi to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more nullptr 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 | « ppapi/proxy/video_decoder_resource.h ('k') | ppapi/proxy/video_encoder_resource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/video_decoder_resource.cc
diff --git a/ppapi/proxy/video_decoder_resource.cc b/ppapi/proxy/video_decoder_resource.cc
index 1519d1ae6531bb3af7ad5640c51950fbc58bb544..cb55764bff4360e6a104243be87344acdbaaea78 100644
--- a/ppapi/proxy/video_decoder_resource.cc
+++ b/ppapi/proxy/video_decoder_resource.cc
@@ -32,7 +32,7 @@ namespace ppapi {
namespace proxy {
VideoDecoderResource::ShmBuffer::ShmBuffer(
- scoped_ptr<base::SharedMemory> shm_ptr,
+ std::unique_ptr<base::SharedMemory> shm_ptr,
uint32_t size,
uint32_t shm_id)
: shm(std::move(shm_ptr)), addr(NULL), shm_id(shm_id) {
@@ -230,9 +230,9 @@ int32_t VideoDecoderResource::Decode(uint32_t decode_id,
base::SharedMemoryHandle shm_handle = base::SharedMemory::NULLHandle();
if (!reply_params.TakeSharedMemoryHandleAtIndex(0, &shm_handle))
return PP_ERROR_NOMEMORY;
- scoped_ptr<base::SharedMemory> shm(
+ std::unique_ptr<base::SharedMemory> shm(
new base::SharedMemory(shm_handle, false /* read_only */));
- scoped_ptr<ShmBuffer> shm_buffer(
+ std::unique_ptr<ShmBuffer> shm_buffer(
new ShmBuffer(std::move(shm), shm_size, shm_id));
if (!shm_buffer->addr)
return PP_ERROR_NOMEMORY;
« no previous file with comments | « ppapi/proxy/video_decoder_resource.h ('k') | ppapi/proxy/video_encoder_resource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698