Chromium Code Reviews| Index: ui/ozone/platform/drm/gpu/gbm_buffer.cc |
| diff --git a/ui/ozone/platform/drm/gpu/gbm_buffer.cc b/ui/ozone/platform/drm/gpu/gbm_buffer.cc |
| index ca9a55b986c60162305bf75b619df72e9046b642..2faa8fb3fea7196fd0cb0a1b2f71c629c0d6fffb 100644 |
| --- a/ui/ozone/platform/drm/gpu/gbm_buffer.cc |
| +++ b/ui/ozone/platform/drm/gpu/gbm_buffer.cc |
| @@ -164,13 +164,15 @@ gfx::NativePixmapHandle GbmPixmap::ExportHandle() { |
| gfx::NativePixmapHandle handle; |
| for (size_t i = 0; |
| i < gfx::NumberOfPlanesForBufferFormat(buffer_->GetFormat()); ++i) { |
| - base::ScopedFD scoped_fd(HANDLE_EINTR(dup(buffer_->GetFd(i)))); |
| - if (!scoped_fd.is_valid()) { |
| - PLOG(ERROR) << "dup"; |
| - return gfx::NativePixmapHandle(); |
| + if (i < buffer_->GetFdCount()) { |
|
dnicoara
2016/06/13 13:41:17
nit: Would you mind adding a comment explaining wh
Daniele Castagna
2016/06/13 17:07:58
Done.
|
| + base::ScopedFD scoped_fd(HANDLE_EINTR(dup(buffer_->GetFd(i)))); |
| + if (!scoped_fd.is_valid()) { |
| + PLOG(ERROR) << "dup"; |
| + return gfx::NativePixmapHandle(); |
| + } |
| + handle.fds.emplace_back( |
| + base::FileDescriptor(scoped_fd.release(), true /* auto_close */)); |
| } |
| - handle.fds.emplace_back( |
| - base::FileDescriptor(scoped_fd.release(), true /* auto_close */)); |
| handle.strides_and_offsets.emplace_back(buffer_->GetStride(i), |
| buffer_->GetOffset(i)); |
| } |