Chromium Code Reviews| Index: ui/gl/gl_image_shared_memory.h |
| diff --git a/ui/gl/gl_image_shared_memory.h b/ui/gl/gl_image_shared_memory.h |
| index d9233cb1fc38584e84ba55fa379f8145b0229f65..622eb3da174f141980fa2e2068aff1fcdffd85d9 100644 |
| --- a/ui/gl/gl_image_shared_memory.h |
| +++ b/ui/gl/gl_image_shared_memory.h |
| @@ -6,7 +6,7 @@ |
| #define UI_GL_GL_IMAGE_SHARED_MEMORY_H_ |
| #include "base/memory/scoped_ptr.h" |
| -#include "ui/gfx/gpu_memory_buffer.h" |
| +#include "base/memory/shared_memory_handle.h" |
| #include "ui/gl/gl_image_memory.h" |
| namespace gfx { |
| @@ -15,8 +15,9 @@ class GL_EXPORT GLImageSharedMemory : public GLImageMemory { |
| public: |
| GLImageSharedMemory(const gfx::Size& size, unsigned internalformat); |
| - bool Initialize(const gfx::GpuMemoryBufferHandle& handle, |
|
reveman
2015/10/01 13:28:16
GLImage implementations should preferably not depe
|
| - gfx::BufferFormat format); |
| + bool Initialize(const base::SharedMemoryHandle& handle, |
| + gfx::GenericSharedMemoryId shared_memory_id, |
| + BufferFormat format); |
| // Overridden from GLImage: |
| void Destroy(bool have_context) override; |
| @@ -29,7 +30,7 @@ class GL_EXPORT GLImageSharedMemory : public GLImageMemory { |
| private: |
| scoped_ptr<base::SharedMemory> shared_memory_; |
| - gfx::GenericSharedMemoryId shared_memory_id_; |
| + GenericSharedMemoryId shared_memory_id_; |
| DISALLOW_COPY_AND_ASSIGN(GLImageSharedMemory); |
| }; |