| 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 622eb3da174f141980fa2e2068aff1fcdffd85d9..d9233cb1fc38584e84ba55fa379f8145b0229f65 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 "base/memory/shared_memory_handle.h"
|
| +#include "ui/gfx/gpu_memory_buffer.h"
|
| #include "ui/gl/gl_image_memory.h"
|
|
|
| namespace gfx {
|
| @@ -15,9 +15,8 @@
|
| public:
|
| GLImageSharedMemory(const gfx::Size& size, unsigned internalformat);
|
|
|
| - bool Initialize(const base::SharedMemoryHandle& handle,
|
| - gfx::GenericSharedMemoryId shared_memory_id,
|
| - BufferFormat format);
|
| + bool Initialize(const gfx::GpuMemoryBufferHandle& handle,
|
| + gfx::BufferFormat format);
|
|
|
| // Overridden from GLImage:
|
| void Destroy(bool have_context) override;
|
| @@ -30,7 +29,7 @@
|
|
|
| private:
|
| scoped_ptr<base::SharedMemory> shared_memory_;
|
| - GenericSharedMemoryId shared_memory_id_;
|
| + gfx::GenericSharedMemoryId shared_memory_id_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(GLImageSharedMemory);
|
| };
|
|
|