gpu/ipc/client/gpu_memory_buffer_impl_test_template.h - Issue 1859703002: convert //gpu to std::unique_ptr

Unified Diff: gpu/ipc/client/gpu_memory_buffer_impl_test_template.h

Issue 1859703002: convert //gpu to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: undo part of clang-format 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

« gpu/ipc/client/gpu_memory_buffer_impl_io_surface.h ('K') | « gpu/ipc/client/gpu_memory_buffer_impl_surface_texture.cc ('k') | gpu/perftests/measurements.h » ('j') | gpu/tools/compositor_model_bench/compositor_model_bench.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/ipc/client/gpu_memory_buffer_impl_test_template.h

diff --git a/gpu/ipc/client/gpu_memory_buffer_impl_test_template.h b/gpu/ipc/client/gpu_memory_buffer_impl_test_template.h

index fa9b1dbcd9bc145ec57d163054472b32c3bb4a73..31ffe4bb2ef5b98bf93afe07bb06e213038a8747 100644

--- a/gpu/ipc/client/gpu_memory_buffer_impl_test_template.h

+++ b/gpu/ipc/client/gpu_memory_buffer_impl_test_template.h

@@ -61,7 +61,7 @@ TYPED_TEST_P(GpuMemoryBufferImplTest, CreateFromHandle) {

GpuMemoryBufferImpl::DestructionCallback destroy_callback =

TestFixture::AllocateGpuMemoryBuffer(kBufferSize, format, usage,

&handle, &destroyed);

- scoped_ptr<TypeParam> buffer(TypeParam::CreateFromHandle(

+ std::unique_ptr<TypeParam> buffer(TypeParam::CreateFromHandle(

handle, kBufferSize, format, usage, destroy_callback));

ASSERT_TRUE(buffer);

EXPECT_EQ(buffer->GetFormat(), format);

@@ -88,7 +88,7 @@ TYPED_TEST_P(GpuMemoryBufferImplTest, Map) {

TestFixture::AllocateGpuMemoryBuffer(

kBufferSize, format, gfx::BufferUsage::GPU_READ_CPU_READ_WRITE,

&handle, nullptr);

- scoped_ptr<TypeParam> buffer(TypeParam::CreateFromHandle(

+ std::unique_ptr<TypeParam> buffer(TypeParam::CreateFromHandle(

handle, kBufferSize, format, gfx::BufferUsage::GPU_READ_CPU_READ_WRITE,

destroy_callback));

ASSERT_TRUE(buffer);

@@ -104,7 +104,7 @@ TYPED_TEST_P(GpuMemoryBufferImplTest, Map) {

gfx::RowSizeForBufferFormat(kBufferSize.width(), format, plane);

EXPECT_GT(row_size_in_bytes, 0u);

- scoped_ptr<char[]> data(new char[row_size_in_bytes]);

+ std::unique_ptr<char[]> data(new char[row_size_in_bytes]);

memset(data.get(), 0x2a + plane, row_size_in_bytes);

size_t height = kBufferSize.height() /

@@ -139,7 +139,7 @@ TYPED_TEST_P(GpuMemoryBufferImplTest, PersistentMap) {

kBufferSize, format,

gfx::BufferUsage::GPU_READ_CPU_READ_WRITE_PERSISTENT, &handle,

nullptr);

- scoped_ptr<TypeParam> buffer(TypeParam::CreateFromHandle(

+ std::unique_ptr<TypeParam> buffer(TypeParam::CreateFromHandle(

handle, kBufferSize, format,

gfx::BufferUsage::GPU_READ_CPU_READ_WRITE_PERSISTENT,

destroy_callback));

@@ -155,7 +155,7 @@ TYPED_TEST_P(GpuMemoryBufferImplTest, PersistentMap) {

gfx::RowSizeForBufferFormat(kBufferSize.width(), format, plane);

EXPECT_GT(row_size_in_bytes, 0u);

- scoped_ptr<char[]> data(new char[row_size_in_bytes]);

+ std::unique_ptr<char[]> data(new char[row_size_in_bytes]);

memset(data.get(), 0x2a + plane, row_size_in_bytes);

size_t height = kBufferSize.height() /

@@ -179,7 +179,7 @@ TYPED_TEST_P(GpuMemoryBufferImplTest, PersistentMap) {

const size_t row_size_in_bytes =

gfx::RowSizeForBufferFormat(kBufferSize.width(), format, plane);

- scoped_ptr<char[]> data(new char[row_size_in_bytes]);

+ std::unique_ptr<char[]> data(new char[row_size_in_bytes]);

memset(data.get(), 0x2a + plane, row_size_in_bytes);

size_t height = kBufferSize.height() /