Revert of Add format modifier IDs for EGL_EXT_image_dma_buf_import extension

components/exo/display.cc

 // Copyright 2015 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 "components/exo/display.h"
 
 #include <iterator>
 #include <utility>
 
 #include "ash/common/shell_window_ids.h"
@@ skipping 44 matching lines @@
   if (!base::SharedMemory::IsHandleValid(handle))
     return nullptr;
 
   return base::WrapUnique(new SharedMemory(handle));
 }
 
 #if defined(USE_OZONE)
 std::unique_ptr<Buffer> Display::CreateLinuxDMABufBuffer(
     const gfx::Size& size,
     gfx::BufferFormat format,
-    const std::vector<gfx::NativePixmapPlane>& planes,
+    const std::vector<int>& strides,
+    const std::vector<int>& offsets,
     std::vector<base::ScopedFD>&& fds) {
   TRACE_EVENT1("exo", "Display::CreateLinuxDMABufBuffer", "size",
                size.ToString());
 
   gfx::GpuMemoryBufferHandle handle;
   handle.type = gfx::OZONE_NATIVE_PIXMAP;
   for (auto& fd : fds)
     handle.native_pixmap_handle.fds.emplace_back(std::move(fd));
 
-  for (auto& plane : planes)
-    handle.native_pixmap_handle.planes.push_back(plane);
+  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]);
+  }
 
   std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer =
       aura::Env::GetInstance()
           ->context_factory()
           ->GetGpuMemoryBufferManager()
           ->CreateGpuMemoryBufferFromHandle(handle, size, format);
   if (!gpu_memory_buffer) {
     LOG(ERROR) << "Failed to create GpuMemoryBuffer from handle";
     return nullptr;
   }
@@ skipping 103 matching lines @@
       notification_surface_manager_->GetSurface(notification_id)) {
     DLOG(ERROR) << "Invalid notification id, id=" << notification_id;
     return nullptr;
   }
 
   return base::MakeUnique<NotificationSurface>(notification_surface_manager_,
                                                surface, notification_id);
 }
 
 }  // namespace exo