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

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 86855a8a3ddefd95d8dcb09454d3c0e1219f03e3..c017142f4c6b073bf1dd4991b46c3803c0cad7a4 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 @@
     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) {}
 
@@ -64,7 +64,8 @@
   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);
@@ -72,7 +73,7 @@
 
   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
@@ -137,7 +138,7 @@
   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;
 }