| Index: ui/gl/gl_image_io_surface.mm
|
| diff --git a/ui/gl/gl_image_io_surface.mm b/ui/gl/gl_image_io_surface.mm
|
| index 3f4964e85438c4e4e6d1e2388ce8bf31e1e01e86..211226a27b373701bda3b7375637823e1c741f66 100644
|
| --- a/ui/gl/gl_image_io_surface.mm
|
| +++ b/ui/gl/gl_image_io_surface.mm
|
| @@ -138,9 +138,11 @@
|
|
|
| } // namespace
|
|
|
| -GLImageIOSurface::GLImageIOSurface(const gfx::Size& size,
|
| +GLImageIOSurface::GLImageIOSurface(gfx::GenericSharedMemoryId io_surface_id,
|
| + const gfx::Size& size,
|
| unsigned internalformat)
|
| - : size_(size),
|
| + : io_surface_id_(io_surface_id),
|
| + size_(size),
|
| internalformat_(internalformat),
|
| format_(BufferFormat::RGBA_8888) {}
|
|
|
| @@ -150,7 +152,6 @@
|
| }
|
|
|
| bool GLImageIOSurface::Initialize(IOSurfaceRef io_surface,
|
| - gfx::GenericSharedMemoryId io_surface_id,
|
| BufferFormat format) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| DCHECK(!io_surface_);
|
| @@ -167,7 +168,6 @@
|
|
|
| format_ = format;
|
| io_surface_.reset(io_surface, base::scoped_policy::RETAIN);
|
| - io_surface_id_ = io_surface_id;
|
| return true;
|
| }
|
|
|
|
|