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

Unified Diff: content/renderer/pepper/pepper_video_encoder_host.cc

Issue 1873783003: Convert //content/renderer 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
Index: content/renderer/pepper/pepper_video_encoder_host.cc
diff --git a/content/renderer/pepper/pepper_video_encoder_host.cc b/content/renderer/pepper/pepper_video_encoder_host.cc
index afdc33d63f73e5e3cca786ab76ce18a2c5303ea5..6444aeb0574a8875868c1cf65a120dc5d57785b6 100644
--- a/content/renderer/pepper/pepper_video_encoder_host.cc
+++ b/content/renderer/pepper/pepper_video_encoder_host.cc
@@ -176,8 +176,9 @@ bool PP_HardwareAccelerationCompatible(bool accelerated,
} // namespace
-PepperVideoEncoderHost::ShmBuffer::ShmBuffer(uint32_t id,
- scoped_ptr<base::SharedMemory> shm)
+PepperVideoEncoderHost::ShmBuffer::ShmBuffer(
+ uint32_t id,
+ std::unique_ptr<base::SharedMemory> shm)
: id(id), shm(std::move(shm)), in_use(true) {
DCHECK(this->shm);
}
@@ -377,7 +378,7 @@ void PepperVideoEncoderHost::RequireBitstreamBuffers(
frame_count_ = frame_count;
for (uint32_t i = 0; i < kDefaultNumberOfBitstreamBuffers; ++i) {
- scoped_ptr<base::SharedMemory> shm(
+ std::unique_ptr<base::SharedMemory> shm(
RenderThread::Get()->HostAllocateSharedMemoryBuffer(
output_buffer_size));
@@ -575,7 +576,7 @@ void PepperVideoEncoderHost::AllocateVideoFrames() {
size *= frame_count_;
uint32_t total_size = size.ValueOrDie();
- scoped_ptr<base::SharedMemory> shm(
+ std::unique_ptr<base::SharedMemory> shm(
RenderThreadImpl::current()->HostAllocateSharedMemoryBuffer(total_size));
if (!shm ||
!buffer_manager_.SetBuffers(frame_count_, buffer_size_aligned,
« no previous file with comments | « content/renderer/pepper/pepper_video_encoder_host.h ('k') | content/renderer/pepper/pepper_video_source_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698