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

Side by Side Diff: components/mus/gles2/mojo_buffer_backing.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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/mus/gles2/mojo_buffer_backing.h" 5 #include "components/mus/gles2/mojo_buffer_backing.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace mus { 9 namespace mus {
10 10
11 MojoBufferBacking::MojoBufferBacking(mojo::ScopedSharedBufferHandle handle, 11 MojoBufferBacking::MojoBufferBacking(mojo::ScopedSharedBufferHandle handle,
12 void* memory, 12 void* memory,
13 size_t size) 13 size_t size)
14 : handle_(std::move(handle)), memory_(memory), size_(size) {} 14 : handle_(std::move(handle)), memory_(memory), size_(size) {}
15 15
16 MojoBufferBacking::~MojoBufferBacking() { 16 MojoBufferBacking::~MojoBufferBacking() {
17 mojo::UnmapBuffer(memory_); 17 mojo::UnmapBuffer(memory_);
18 } 18 }
19 19
20 // static 20 // static
21 scoped_ptr<gpu::BufferBacking> MojoBufferBacking::Create( 21 std::unique_ptr<gpu::BufferBacking> MojoBufferBacking::Create(
22 mojo::ScopedSharedBufferHandle handle, 22 mojo::ScopedSharedBufferHandle handle,
23 size_t size) { 23 size_t size) {
24 void* memory = NULL; 24 void* memory = NULL;
25 MojoResult result = mojo::MapBuffer(handle.get(), 0, size, &memory, 25 MojoResult result = mojo::MapBuffer(handle.get(), 0, size, &memory,
26 MOJO_MAP_BUFFER_FLAG_NONE); 26 MOJO_MAP_BUFFER_FLAG_NONE);
27 if (result != MOJO_RESULT_OK) 27 if (result != MOJO_RESULT_OK)
28 return scoped_ptr<BufferBacking>(); 28 return std::unique_ptr<BufferBacking>();
29 DCHECK(memory); 29 DCHECK(memory);
30 return scoped_ptr<BufferBacking>( 30 return std::unique_ptr<BufferBacking>(
31 new MojoBufferBacking(std::move(handle), memory, size)); 31 new MojoBufferBacking(std::move(handle), memory, size));
32 } 32 }
33 void* MojoBufferBacking::GetMemory() const { 33 void* MojoBufferBacking::GetMemory() const {
34 return memory_; 34 return memory_;
35 } 35 }
36 size_t MojoBufferBacking::GetSize() const { 36 size_t MojoBufferBacking::GetSize() const {
37 return size_; 37 return size_;
38 } 38 }
39 39
40 } // namespace mus 40 } // namespace mus
OLDNEW
« no previous file with comments | « components/mus/gles2/mojo_buffer_backing.h ('k') | components/mus/gles2/mojo_gpu_memory_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698