Index: content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h |
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h b/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h |
index 882e1e04235a443c01bfe69991a63ecec64fafe8..42bb7310c08297c510ca18c1a1bba9421b0ef20c 100644 |
--- a/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h |
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h |
@@ -6,6 +6,7 @@ |
#define CONTENT_COMMON_GPU_CLIENT_GPU_MEMORY_BUFFER_IMPL_OZONE_NATIVE_BUFFER_H_ |
#include "content/common/gpu/client/gpu_memory_buffer_impl.h" |
+#include "ui/ozone/public/native_pixmap_manager.h" |
namespace content { |
@@ -13,12 +14,15 @@ namespace content { |
class GpuMemoryBufferImplOzoneNativeBuffer : public GpuMemoryBufferImpl { |
reveman
2015/06/25 14:07:51
There's now both OzoneNativeBuffer and NativePixma
dshwang
2015/06/25 14:52:13
I think GpuMemoryBufferFactoryOzoneNativeBuffer an
|
public: |
static scoped_ptr<GpuMemoryBufferImpl> CreateFromHandle( |
+ ui::NativePixmapManager* manager, |
const gfx::GpuMemoryBufferHandle& handle, |
const gfx::Size& size, |
Format format, |
Usage usage, |
const DestructionCallback& callback); |
+ ~GpuMemoryBufferImplOzoneNativeBuffer() override; |
+ |
// Overridden from gfx::GpuMemoryBuffer: |
bool Map(void** data) override; |
void Unmap() override; |
@@ -29,8 +33,14 @@ class GpuMemoryBufferImplOzoneNativeBuffer : public GpuMemoryBufferImpl { |
GpuMemoryBufferImplOzoneNativeBuffer(gfx::GpuMemoryBufferId id, |
const gfx::Size& size, |
Format format, |
+ Usage usage, |
const DestructionCallback& callback); |
- ~GpuMemoryBufferImplOzoneNativeBuffer() override; |
+ |
+ bool Initialize(ui::NativePixmapManager* manager, |
+ const gfx::GpuMemoryBufferHandle& handle); |
+ |
+ scoped_refptr<ui::NativePixmap> pixmap_; |
+ Usage usage_; |
DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferImplOzoneNativeBuffer); |
}; |