| Index: components/mus/gles2/mojo_buffer_backing.cc
|
| diff --git a/components/view_manager/gles2/mojo_buffer_backing.cc b/components/mus/gles2/mojo_buffer_backing.cc
|
| similarity index 67%
|
| rename from components/view_manager/gles2/mojo_buffer_backing.cc
|
| rename to components/mus/gles2/mojo_buffer_backing.cc
|
| index 94646e1df7b4c7a320be4076d1e80d245c03d7fb..bdb745bef47ce16a4ebf4d6c4c0a327f6c6b087a 100644
|
| --- a/components/view_manager/gles2/mojo_buffer_backing.cc
|
| +++ b/components/mus/gles2/mojo_buffer_backing.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "components/view_manager/gles2/mojo_buffer_backing.h"
|
| +#include "components/mus/gles2/mojo_buffer_backing.h"
|
|
|
| #include "base/logging.h"
|
|
|
| @@ -13,22 +13,28 @@ MojoBufferBacking::MojoBufferBacking(mojo::ScopedSharedBufferHandle handle,
|
| size_t size)
|
| : handle_(handle.Pass()), memory_(memory), size_(size) {}
|
|
|
| -MojoBufferBacking::~MojoBufferBacking() { mojo::UnmapBuffer(memory_); }
|
| +MojoBufferBacking::~MojoBufferBacking() {
|
| + mojo::UnmapBuffer(memory_);
|
| +}
|
|
|
| // static
|
| scoped_ptr<gpu::BufferBacking> MojoBufferBacking::Create(
|
| mojo::ScopedSharedBufferHandle handle,
|
| size_t size) {
|
| void* memory = NULL;
|
| - MojoResult result = mojo::MapBuffer(
|
| - handle.get(), 0, size, &memory, MOJO_MAP_BUFFER_FLAG_NONE);
|
| + MojoResult result = mojo::MapBuffer(handle.get(), 0, size, &memory,
|
| + MOJO_MAP_BUFFER_FLAG_NONE);
|
| if (result != MOJO_RESULT_OK)
|
| return scoped_ptr<BufferBacking>();
|
| DCHECK(memory);
|
| return scoped_ptr<BufferBacking>(
|
| new MojoBufferBacking(handle.Pass(), memory, size));
|
| }
|
| -void* MojoBufferBacking::GetMemory() const { return memory_; }
|
| -size_t MojoBufferBacking::GetSize() const { return size_; }
|
| +void* MojoBufferBacking::GetMemory() const {
|
| + return memory_;
|
| +}
|
| +size_t MojoBufferBacking::GetSize() const {
|
| + return size_;
|
| +}
|
|
|
| } // namespace gles2
|
|
|