| Index: content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc
|
| diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc b/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc
|
| similarity index 55%
|
| rename from content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc
|
| rename to content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc
|
| index 9a427a9194fe94e95f51b885621e046a3ff0415c..ee89e004512f99a0f959a03beaaaaf0d985a423b 100644
|
| --- a/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc
|
| +++ b/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc
|
| @@ -2,53 +2,51 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h"
|
| +#include "content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.h"
|
|
|
| #include "ui/ozone/public/surface_factory_ozone.h"
|
|
|
| namespace content {
|
|
|
| -GpuMemoryBufferImplOzoneNativeBuffer::GpuMemoryBufferImplOzoneNativeBuffer(
|
| +GpuMemoryBufferImplOzoneNativePixmap::GpuMemoryBufferImplOzoneNativePixmap(
|
| gfx::GpuMemoryBufferId id,
|
| const gfx::Size& size,
|
| Format format,
|
| const DestructionCallback& callback)
|
| - : GpuMemoryBufferImpl(id, size, format, callback) {
|
| -}
|
| + : GpuMemoryBufferImpl(id, size, format, callback) {}
|
|
|
| -GpuMemoryBufferImplOzoneNativeBuffer::~GpuMemoryBufferImplOzoneNativeBuffer() {
|
| -}
|
| +GpuMemoryBufferImplOzoneNativePixmap::~GpuMemoryBufferImplOzoneNativePixmap() {}
|
|
|
| // static
|
| scoped_ptr<GpuMemoryBufferImpl>
|
| -GpuMemoryBufferImplOzoneNativeBuffer::CreateFromHandle(
|
| +GpuMemoryBufferImplOzoneNativePixmap::CreateFromHandle(
|
| const gfx::GpuMemoryBufferHandle& handle,
|
| const gfx::Size& size,
|
| Format format,
|
| Usage usage,
|
| const DestructionCallback& callback) {
|
| return make_scoped_ptr<GpuMemoryBufferImpl>(
|
| - new GpuMemoryBufferImplOzoneNativeBuffer(
|
| - handle.id, size, format, callback));
|
| + new GpuMemoryBufferImplOzoneNativePixmap(handle.id, size, format,
|
| + callback));
|
| }
|
|
|
| -bool GpuMemoryBufferImplOzoneNativeBuffer::Map(void** data) {
|
| +bool GpuMemoryBufferImplOzoneNativePixmap::Map(void** data) {
|
| NOTREACHED();
|
| return false;
|
| }
|
|
|
| -void GpuMemoryBufferImplOzoneNativeBuffer::Unmap() {
|
| +void GpuMemoryBufferImplOzoneNativePixmap::Unmap() {
|
| NOTREACHED();
|
| }
|
|
|
| -void GpuMemoryBufferImplOzoneNativeBuffer::GetStride(int* stride) const {
|
| +void GpuMemoryBufferImplOzoneNativePixmap::GetStride(int* stride) const {
|
| NOTREACHED();
|
| }
|
|
|
| -gfx::GpuMemoryBufferHandle GpuMemoryBufferImplOzoneNativeBuffer::GetHandle()
|
| +gfx::GpuMemoryBufferHandle GpuMemoryBufferImplOzoneNativePixmap::GetHandle()
|
| const {
|
| gfx::GpuMemoryBufferHandle handle;
|
| - handle.type = gfx::OZONE_NATIVE_BUFFER;
|
| + handle.type = gfx::OZONE_NATIVE_PIXMAP;
|
| handle.id = id_;
|
| return handle;
|
| }
|
|
|