Revert of Add format modifier IDs for EGL_EXT_image_dma_buf_import extension

ui/ozone/platform/drm/gpu/gbm_surface_factory.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 "ui/ozone/platform/drm/gpu/gbm_surface_factory.h"
 
 #include <gbm.h>
 
 #include "base/files/file_path.h"
 #include "base/memory/ptr_util.h"
@@ skipping 96 matching lines @@
   if (!buffer.get())
     return nullptr;
 
   return make_scoped_refptr(new GbmPixmap(this, buffer));
 }
 
 scoped_refptr<ui::NativePixmap> GbmSurfaceFactory::CreateNativePixmapFromHandle(
     gfx::Size size,
     gfx::BufferFormat format,
     const gfx::NativePixmapHandle& handle) {
-  size_t num_planes = gfx::NumberOfPlanesForBufferFormat(format);
-  if (handle.planes.size() != num_planes ||
-      (handle.fds.size() != 1 && handle.fds.size() != num_planes)) {
+  size_t planes = gfx::NumberOfPlanesForBufferFormat(format);
+  if (handle.strides_and_offsets.size() != planes ||
+      (handle.fds.size() != 1 && handle.fds.size() != planes)) {
     return nullptr;
   }
   std::vector<base::ScopedFD> scoped_fds;
   for (auto& fd : handle.fds) {
     scoped_fds.emplace_back(fd.fd);
   }
 
-  std::vector<gfx::NativePixmapPlane> planes;
+  std::vector<int> strides;
+  std::vector<int> offsets;
 
-  for (const auto& plane : handle.planes) {
-    planes.push_back(plane);
+  for (const auto& stride_and_offset : handle.strides_and_offsets) {
+    strides.push_back(stride_and_offset.first);
+    offsets.push_back(stride_and_offset.second);
   }
 
   scoped_refptr<GbmBuffer> buffer = drm_thread_->CreateBufferFromFds(
-      size, format, std::move(scoped_fds), planes);
+      size, format, std::move(scoped_fds), strides, offsets);
   if (!buffer)
     return nullptr;
   return make_scoped_refptr(new GbmPixmap(this, buffer));
 }
 
 }  // namespace ui