Chromium Code Reviews| Index: components/exo/display.cc |
| diff --git a/components/exo/display.cc b/components/exo/display.cc |
| index 72eb656bb96f8db5b3b5a0988e4bf80f183cd87a..95adf200a0a55becff09ef224a621805a352605d 100644 |
| --- a/components/exo/display.cc |
| +++ b/components/exo/display.cc |
| @@ -63,8 +63,7 @@ std::unique_ptr<SharedMemory> Display::CreateSharedMemory( |
| std::unique_ptr<Buffer> Display::CreateLinuxDMABufBuffer( |
| const gfx::Size& size, |
| gfx::BufferFormat format, |
| - const std::vector<int>& strides, |
| - const std::vector<int>& offsets, |
| + const std::vector<gfx::GbmBufferPlane>&& planes, |
|
Daniele Castagna
2016/06/15 03:50:19
No need for an rvalue reference here, just a norma
vinceh
2016/06/15 04:35:18
Will fix. Thanks.
|
| std::vector<base::ScopedFD>&& fds) { |
| TRACE_EVENT1("exo", "Display::CreateLinuxDMABufBuffer", "size", |
| size.ToString()); |
| @@ -74,11 +73,8 @@ std::unique_ptr<Buffer> Display::CreateLinuxDMABufBuffer( |
| for (auto& fd : fds) |
| handle.native_pixmap_handle.fds.emplace_back(std::move(fd)); |
| - DCHECK_EQ(strides.size(), offsets.size()); |
| - for (size_t plane = 0; plane < strides.size(); ++plane) { |
| - handle.native_pixmap_handle.strides_and_offsets.emplace_back( |
| - strides[plane], offsets[plane]); |
| - } |
| + for (auto& plane : planes) |
| + handle.native_pixmap_handle.planes.emplace_back(std::move(plane)); |
| std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer = |
| aura::Env::GetInstance() |