| Index: components/mus/gles2/mojo_gpu_memory_buffer.cc
|
| diff --git a/components/mus/gles2/mojo_gpu_memory_buffer.cc b/components/mus/gles2/mojo_gpu_memory_buffer.cc
|
| index 83a86d4e10e7f8cabe18e73d0d0c65e37cab5629..689c0e4d03c293d7fe656f693b7b7183fe6d4011 100644
|
| --- a/components/mus/gles2/mojo_gpu_memory_buffer.cc
|
| +++ b/components/mus/gles2/mojo_gpu_memory_buffer.cc
|
| @@ -18,11 +18,10 @@ MojoGpuMemoryBufferImpl::MojoGpuMemoryBufferImpl(
|
| const gfx::Size& size,
|
| gfx::BufferFormat format,
|
| scoped_ptr<base::SharedMemory> shared_memory)
|
| - : size_(size),
|
| - format_(format),
|
| - shared_memory_(std::move(shared_memory)),
|
| - mapped_(false) {}
|
| + : GpuMemoryBufferImpl(gfx::GenericSharedMemoryId(0), size, format),
|
| + shared_memory_(std::move(shared_memory)) {}
|
|
|
| +// TODO(rjkroege): Support running a destructor callback as necessary.
|
| MojoGpuMemoryBufferImpl::~MojoGpuMemoryBufferImpl() {}
|
|
|
| scoped_ptr<gfx::GpuMemoryBuffer> MojoGpuMemoryBufferImpl::Create(
|
| @@ -76,24 +75,12 @@ void MojoGpuMemoryBufferImpl::Unmap() {
|
| mapped_ = false;
|
| }
|
|
|
| -gfx::Size MojoGpuMemoryBufferImpl::GetSize() const {
|
| - return size_;
|
| -}
|
| -
|
| -gfx::BufferFormat MojoGpuMemoryBufferImpl::GetFormat() const {
|
| - return format_;
|
| -}
|
| -
|
| int MojoGpuMemoryBufferImpl::stride(size_t plane) const {
|
| DCHECK_LT(plane, gfx::NumberOfPlanesForBufferFormat(format_));
|
| return base::checked_cast<int>(gfx::RowSizeForBufferFormat(
|
| size_.width(), format_, static_cast<int>(plane)));
|
| }
|
|
|
| -gfx::GpuMemoryBufferId MojoGpuMemoryBufferImpl::GetId() const {
|
| - return gfx::GpuMemoryBufferId(0);
|
| -}
|
| -
|
| gfx::GpuMemoryBufferHandle MojoGpuMemoryBufferImpl::GetHandle() const {
|
| gfx::GpuMemoryBufferHandle handle;
|
| handle.type = gfx::SHARED_MEMORY_BUFFER;
|
| @@ -101,11 +88,12 @@ gfx::GpuMemoryBufferHandle MojoGpuMemoryBufferImpl::GetHandle() const {
|
| handle.offset = 0;
|
| handle.stride = static_cast<int32_t>(
|
| gfx::RowSizeForBufferFormat(size_.width(), format_, 0));
|
| +
|
| return handle;
|
| }
|
|
|
| -ClientBuffer MojoGpuMemoryBufferImpl::AsClientBuffer() {
|
| - return reinterpret_cast<ClientBuffer>(this);
|
| +gfx::GpuMemoryBufferType MojoGpuMemoryBufferImpl::GetBufferType() const {
|
| + return gfx::SHARED_MEMORY_BUFFER;
|
| }
|
|
|
| } // namespace mus
|
|
|