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

Unified Diff: gpu/ipc/client/gpu_memory_buffer_impl_shared_memory.cc

Issue 1859703002: convert //gpu to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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: gpu/ipc/client/gpu_memory_buffer_impl_shared_memory.cc
diff --git a/gpu/ipc/client/gpu_memory_buffer_impl_shared_memory.cc b/gpu/ipc/client/gpu_memory_buffer_impl_shared_memory.cc
index ef817243863f00141c1f2658aa271a73fa9298f4..40345fb26d96adfd66359dee5d96f04ddcdeac47 100644
--- a/gpu/ipc/client/gpu_memory_buffer_impl_shared_memory.cc
+++ b/gpu/ipc/client/gpu_memory_buffer_impl_shared_memory.cc
@@ -8,6 +8,7 @@
#include <utility>
#include "base/bind.h"
+#include "base/memory/ptr_util.h"
#include "base/numerics/safe_math.h"
#include "base/process/memory.h"
#include "ui/gfx/buffer_format_util.h"
@@ -25,7 +26,7 @@ GpuMemoryBufferImplSharedMemory::GpuMemoryBufferImplSharedMemory(
const gfx::Size& size,
gfx::BufferFormat format,
const DestructionCallback& callback,
- scoped_ptr<base::SharedMemory> shared_memory,
+ std::unique_ptr<base::SharedMemory> shared_memory,
size_t offset,
int stride)
: GpuMemoryBufferImpl(id, size, format, callback),
@@ -38,7 +39,7 @@ GpuMemoryBufferImplSharedMemory::GpuMemoryBufferImplSharedMemory(
GpuMemoryBufferImplSharedMemory::~GpuMemoryBufferImplSharedMemory() {}
// static
-scoped_ptr<GpuMemoryBufferImplSharedMemory>
+std::unique_ptr<GpuMemoryBufferImplSharedMemory>
GpuMemoryBufferImplSharedMemory::Create(gfx::GpuMemoryBufferId id,
const gfx::Size& size,
gfx::BufferFormat format,
@@ -47,11 +48,11 @@ GpuMemoryBufferImplSharedMemory::Create(gfx::GpuMemoryBufferId id,
if (!gfx::BufferSizeForBufferFormatChecked(size, format, &buffer_size))
return nullptr;
- scoped_ptr<base::SharedMemory> shared_memory(new base::SharedMemory());
+ std::unique_ptr<base::SharedMemory> shared_memory(new base::SharedMemory());
if (!shared_memory->CreateAndMapAnonymous(buffer_size))
return nullptr;
- return make_scoped_ptr(new GpuMemoryBufferImplSharedMemory(
+ return base::WrapUnique(new GpuMemoryBufferImplSharedMemory(
id, size, format, callback, std::move(shared_memory), 0,
gfx::RowSizeForBufferFormat(size.width(), format, 0)));
}
@@ -82,7 +83,7 @@ GpuMemoryBufferImplSharedMemory::AllocateForChildProcess(
}
// static
-scoped_ptr<GpuMemoryBufferImplSharedMemory>
+std::unique_ptr<GpuMemoryBufferImplSharedMemory>
GpuMemoryBufferImplSharedMemory::CreateFromHandle(
const gfx::GpuMemoryBufferHandle& handle,
const gfx::Size& size,
@@ -91,9 +92,9 @@ GpuMemoryBufferImplSharedMemory::CreateFromHandle(
const DestructionCallback& callback) {
DCHECK(base::SharedMemory::IsHandleValid(handle.handle));
- return make_scoped_ptr(new GpuMemoryBufferImplSharedMemory(
+ return base::WrapUnique(new GpuMemoryBufferImplSharedMemory(
handle.id, size, format, callback,
- make_scoped_ptr(new base::SharedMemory(handle.handle, false)),
+ base::WrapUnique(new base::SharedMemory(handle.handle, false)),
handle.offset, handle.stride));
}
« no previous file with comments | « gpu/ipc/client/gpu_memory_buffer_impl_shared_memory.h ('k') | gpu/ipc/client/gpu_memory_buffer_impl_shared_memory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698