| Index: ui/gl/gl_image_io_surface.h
|
| diff --git a/ui/gl/gl_image_io_surface.h b/ui/gl/gl_image_io_surface.h
|
| index 56b4478ec3be793f8f99db75024c753b3eaa0412..bf65b0f56df588a86efefcf180c095f4dc130c31 100644
|
| --- a/ui/gl/gl_image_io_surface.h
|
| +++ b/ui/gl/gl_image_io_surface.h
|
| @@ -22,11 +22,11 @@
|
|
|
| class GL_EXPORT GLImageIOSurface : public GLImage {
|
| public:
|
| - GLImageIOSurface(const gfx::Size& size, unsigned internalformat);
|
| + GLImageIOSurface(gfx::GenericSharedMemoryId io_surface_id,
|
| + const gfx::Size& size,
|
| + unsigned internalformat);
|
|
|
| - bool Initialize(IOSurfaceRef io_surface,
|
| - gfx::GenericSharedMemoryId io_surface_id,
|
| - BufferFormat format);
|
| + bool Initialize(IOSurfaceRef io_surface, BufferFormat format);
|
|
|
| // Overridden from GLImage:
|
| void Destroy(bool have_context) override;
|
| @@ -59,11 +59,11 @@
|
| ~GLImageIOSurface() override;
|
|
|
| private:
|
| + gfx::GenericSharedMemoryId io_surface_id_;
|
| const gfx::Size size_;
|
| const unsigned internalformat_;
|
| BufferFormat format_;
|
| base::ScopedCFTypeRef<IOSurfaceRef> io_surface_;
|
| - gfx::GenericSharedMemoryId io_surface_id_;
|
| base::ThreadChecker thread_checker_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(GLImageIOSurface);
|
|
|