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

Unified Diff: components/mus/gles2/mojo_gpu_memory_buffer.h

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/mojo_buffer_backing.cc ('k') | components/mus/gles2/mojo_gpu_memory_buffer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/gles2/mojo_gpu_memory_buffer.h
diff --git a/components/mus/gles2/mojo_gpu_memory_buffer.h b/components/mus/gles2/mojo_gpu_memory_buffer.h
index d4e54c75634968f825012e04adc2d5b1a22dbb59..1a835535b796af5153e29b0ba417aec9aa935877 100644
--- a/components/mus/gles2/mojo_gpu_memory_buffer.h
+++ b/components/mus/gles2/mojo_gpu_memory_buffer.h
@@ -7,8 +7,9 @@
#include <stddef.h>
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "components/mus/gles2/gpu_memory_buffer_impl.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/gpu_memory_buffer.h"
@@ -19,12 +20,12 @@ class MojoGpuMemoryBufferImpl : public mus::GpuMemoryBufferImpl {
public:
MojoGpuMemoryBufferImpl(const gfx::Size& size,
gfx::BufferFormat format,
- scoped_ptr<base::SharedMemory> shared_memory);
+ std::unique_ptr<base::SharedMemory> shared_memory);
~MojoGpuMemoryBufferImpl() override;
- static scoped_ptr<gfx::GpuMemoryBuffer> Create(const gfx::Size& size,
- gfx::BufferFormat format,
- gfx::BufferUsage usage);
+ static std::unique_ptr<gfx::GpuMemoryBuffer> Create(const gfx::Size& size,
+ gfx::BufferFormat format,
+ gfx::BufferUsage usage);
static MojoGpuMemoryBufferImpl* FromClientBuffer(ClientBuffer buffer);
@@ -41,7 +42,7 @@ class MojoGpuMemoryBufferImpl : public mus::GpuMemoryBufferImpl {
gfx::GpuMemoryBufferType GetBufferType() const override;
private:
- scoped_ptr<base::SharedMemory> shared_memory_;
+ std::unique_ptr<base::SharedMemory> shared_memory_;
DISALLOW_COPY_AND_ASSIGN(MojoGpuMemoryBufferImpl);
};
« no previous file with comments | « components/mus/gles2/mojo_buffer_backing.cc ('k') | components/mus/gles2/mojo_gpu_memory_buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698