| Index: gpu/ipc/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc
|
| diff --git a/gpu/ipc/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc b/gpu/ipc/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc
|
| index c017142f4c6b073bf1dd4991b46c3803c0cad7a4..86855a8a3ddefd95d8dcb09454d3c0e1219f03e3 100644
|
| --- a/gpu/ipc/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc
|
| +++ b/gpu/ipc/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc
|
| @@ -30,11 +30,11 @@ GpuMemoryBufferImplOzoneNativePixmap::GpuMemoryBufferImplOzoneNativePixmap(
|
| gfx::BufferFormat format,
|
| const DestructionCallback& callback,
|
| std::unique_ptr<ui::ClientNativePixmap> pixmap,
|
| - const std::vector<std::pair<int, int>>& strides_and_offsets,
|
| + const std::vector<gfx::NativePixmapPlane>& planes,
|
| base::ScopedFD fd)
|
| : GpuMemoryBufferImpl(id, size, format, callback),
|
| pixmap_(std::move(pixmap)),
|
| - strides_and_offsets_(strides_and_offsets),
|
| + planes_(planes),
|
| fd_(std::move(fd)),
|
| data_(nullptr) {}
|
|
|
| @@ -64,8 +64,7 @@ GpuMemoryBufferImplOzoneNativePixmap::CreateFromHandle(
|
| gfx::NativePixmapHandle native_pixmap_handle;
|
| native_pixmap_handle.fds.emplace_back(handle.native_pixmap_handle.fds[0].fd,
|
| true /* auto_close */);
|
| - native_pixmap_handle.strides_and_offsets =
|
| - handle.native_pixmap_handle.strides_and_offsets;
|
| + native_pixmap_handle.planes = handle.native_pixmap_handle.planes;
|
| std::unique_ptr<ui::ClientNativePixmap> native_pixmap =
|
| ui::ClientNativePixmapFactory::GetInstance()->ImportFromHandle(
|
| native_pixmap_handle, size, usage);
|
| @@ -73,7 +72,7 @@ GpuMemoryBufferImplOzoneNativePixmap::CreateFromHandle(
|
|
|
| return base::WrapUnique(new GpuMemoryBufferImplOzoneNativePixmap(
|
| handle.id, size, format, callback, std::move(native_pixmap),
|
| - handle.native_pixmap_handle.strides_and_offsets, std::move(scoped_fd)));
|
| + handle.native_pixmap_handle.planes, std::move(scoped_fd)));
|
| }
|
|
|
| // static
|
| @@ -138,7 +137,7 @@ gfx::GpuMemoryBufferHandle GpuMemoryBufferImplOzoneNativePixmap::GetHandle()
|
| handle.id = id_;
|
| handle.native_pixmap_handle.fds.emplace_back(fd_.get(),
|
| false /* auto_close */);
|
| - handle.native_pixmap_handle.strides_and_offsets = strides_and_offsets_;
|
| + handle.native_pixmap_handle.planes = planes_;
|
| return handle;
|
| }
|
|
|
|
|