Revert of Add format modifier IDs for EGL_EXT_image_dma_buf_import extension

gpu/ipc/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/ipc/client/gpu_memory_buffer_impl_ozone_native_pixmap.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
@@ skipping 12 matching lines @@
 }
 
 }  // namespace
 
 GpuMemoryBufferImplOzoneNativePixmap::GpuMemoryBufferImplOzoneNativePixmap(
     gfx::GpuMemoryBufferId id,
     const gfx::Size& size,
     gfx::BufferFormat format,
     const DestructionCallback& callback,
     std::unique_ptr<ui::ClientNativePixmap> pixmap,
-    const std::vector<gfx::NativePixmapPlane>& planes,
+    const std::vector<std::pair<int, int>>& strides_and_offsets,
     base::ScopedFD fd)
     : GpuMemoryBufferImpl(id, size, format, callback),
       pixmap_(std::move(pixmap)),
-      planes_(planes),
+      strides_and_offsets_(strides_and_offsets),
       fd_(std::move(fd)),
       data_(nullptr) {}
 
 GpuMemoryBufferImplOzoneNativePixmap::~GpuMemoryBufferImplOzoneNativePixmap() {}
 
 // static
 std::unique_ptr<GpuMemoryBufferImplOzoneNativePixmap>
 GpuMemoryBufferImplOzoneNativePixmap::CreateFromHandle(
     const gfx::GpuMemoryBufferHandle& handle,
     const gfx::Size& size,
     gfx::BufferFormat format,
     gfx::BufferUsage usage,
     const DestructionCallback& callback) {
   DCHECK_EQ(handle.native_pixmap_handle.fds.size(), 1u);
 
   // GpuMemoryBufferImpl needs the FD to implement GetHandle() but
   // ui::ClientNativePixmapFactory::ImportFromHandle is expected to take
   // ownership of the FD passed in the handle so we have to dup it here in
   // order to pass a valid FD to the GpuMemoryBufferImpl ctor.
   base::ScopedFD scoped_fd(
       HANDLE_EINTR(dup(handle.native_pixmap_handle.fds[0].fd)));
   if (!scoped_fd.is_valid()) {
     PLOG(ERROR) << "dup";
     return nullptr;
   }
 
   gfx::NativePixmapHandle native_pixmap_handle;
   native_pixmap_handle.fds.emplace_back(handle.native_pixmap_handle.fds[0].fd,
                                         true /* auto_close */);
-  native_pixmap_handle.planes = handle.native_pixmap_handle.planes;
+  native_pixmap_handle.strides_and_offsets =
+      handle.native_pixmap_handle.strides_and_offsets;
   std::unique_ptr<ui::ClientNativePixmap> native_pixmap =
       ui::ClientNativePixmapFactory::GetInstance()->ImportFromHandle(
           native_pixmap_handle, size, usage);
   DCHECK(native_pixmap);
 
   return base::WrapUnique(new GpuMemoryBufferImplOzoneNativePixmap(
       handle.id, size, format, callback, std::move(native_pixmap),
-      handle.native_pixmap_handle.planes, std::move(scoped_fd)));
+      handle.native_pixmap_handle.strides_and_offsets, std::move(scoped_fd)));
 }
 
 // static
 bool GpuMemoryBufferImplOzoneNativePixmap::IsConfigurationSupported(
     gfx::BufferFormat format,
     gfx::BufferUsage usage) {
   return gpu::IsNativeGpuMemoryBufferConfigurationSupported(format, usage);
 }
 
 // static
@@ skipping 44 matching lines @@
   return stride;
 }
 
 gfx::GpuMemoryBufferHandle GpuMemoryBufferImplOzoneNativePixmap::GetHandle()
     const {
   gfx::GpuMemoryBufferHandle handle;
   handle.type = gfx::OZONE_NATIVE_PIXMAP;
   handle.id = id_;
   handle.native_pixmap_handle.fds.emplace_back(fd_.get(),
                                                false /* auto_close */);
-  handle.native_pixmap_handle.planes = planes_;
+  handle.native_pixmap_handle.strides_and_offsets = strides_and_offsets_;
   return handle;
 }
 
 }  // namespace gpu