| 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 afed2aa5de91a108bdb1276b4eb11311714e701a..d4e54c75634968f825012e04adc2d5b1a22dbb59 100644
|
| --- a/components/mus/gles2/mojo_gpu_memory_buffer.h
|
| +++ b/components/mus/gles2/mojo_gpu_memory_buffer.h
|
| @@ -9,12 +9,13 @@
|
|
|
| #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"
|
|
|
| namespace mus {
|
|
|
| -class MojoGpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
|
| +class MojoGpuMemoryBufferImpl : public mus::GpuMemoryBufferImpl {
|
| public:
|
| MojoGpuMemoryBufferImpl(const gfx::Size& size,
|
| gfx::BufferFormat format,
|
| @@ -33,18 +34,14 @@ class MojoGpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
|
| bool Map() override;
|
| void* memory(size_t plane) override;
|
| void Unmap() override;
|
| - gfx::Size GetSize() const override;
|
| - gfx::BufferFormat GetFormat() const override;
|
| int stride(size_t plane) const override;
|
| - gfx::GpuMemoryBufferId GetId() const override;
|
| gfx::GpuMemoryBufferHandle GetHandle() const override;
|
| - ClientBuffer AsClientBuffer() override;
|
| +
|
| + // Overridden from gfx::GpuMemoryBufferImpl
|
| + gfx::GpuMemoryBufferType GetBufferType() const override;
|
|
|
| private:
|
| - const gfx::Size size_;
|
| - gfx::BufferFormat format_;
|
| scoped_ptr<base::SharedMemory> shared_memory_;
|
| - bool mapped_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MojoGpuMemoryBufferImpl);
|
| };
|
|
|