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

Unified Diff: components/mus/gles2/ozone_gpu_memory_buffer.cc

Issue 1906623003: Convert //components/mus 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 | « components/mus/gles2/ozone_gpu_memory_buffer.h ('k') | components/mus/gles2/raster_thread_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/gles2/ozone_gpu_memory_buffer.cc
diff --git a/components/mus/gles2/ozone_gpu_memory_buffer.cc b/components/mus/gles2/ozone_gpu_memory_buffer.cc
index acd39930f52a11f77e8f65bd9cf17ee7fcc5c50e..c53b51f5adedc884e706ab7888199a82b3282809 100644
--- a/components/mus/gles2/ozone_gpu_memory_buffer.cc
+++ b/components/mus/gles2/ozone_gpu_memory_buffer.cc
@@ -17,7 +17,7 @@ OzoneGpuMemoryBuffer::OzoneGpuMemoryBuffer(
gfx::GpuMemoryBufferId id,
const gfx::Size& size,
gfx::BufferFormat format,
- scoped_ptr<ui::ClientNativePixmap> client_pixmap,
+ std::unique_ptr<ui::ClientNativePixmap> client_pixmap,
scoped_refptr<ui::NativePixmap> native_pixmap)
: GpuMemoryBufferImpl(id, size, format),
client_pixmap_(std::move(client_pixmap)),
@@ -34,7 +34,7 @@ OzoneGpuMemoryBuffer* OzoneGpuMemoryBuffer::FromClientBuffer(
}
// static
-scoped_ptr<gfx::GpuMemoryBuffer>
+std::unique_ptr<gfx::GpuMemoryBuffer>
OzoneGpuMemoryBuffer::CreateOzoneGpuMemoryBuffer(
const gfx::Size& size,
gfx::BufferFormat format,
@@ -58,11 +58,11 @@ OzoneGpuMemoryBuffer::CreateOzoneGpuMemoryBuffer(
gfx::NativePixmapHandle native_pixmap_handle = pixmap->ExportHandle();
DCHECK(ui::ClientNativePixmapFactory::GetInstance())
<< "need me a ClientNativePixmapFactory";
- scoped_ptr<ui::ClientNativePixmap> client_native_pixmap =
+ std::unique_ptr<ui::ClientNativePixmap> client_native_pixmap =
ui::ClientNativePixmapFactory::GetInstance()->ImportFromHandle(
native_pixmap_handle, size, usage);
- scoped_ptr<OzoneGpuMemoryBuffer> nb(
+ std::unique_ptr<OzoneGpuMemoryBuffer> nb(
new OzoneGpuMemoryBuffer(gfx::GpuMemoryBufferId(0), size, format,
std::move(client_native_pixmap), pixmap));
return std::move(nb);
« no previous file with comments | « components/mus/gles2/ozone_gpu_memory_buffer.h ('k') | components/mus/gles2/raster_thread_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698