Revert of Add format modifier IDs for EGL_EXT_image_dma_buf_import extension

components/exo/wayland/server.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/wayland/server.h"
 
 #include <grp.h>
 #include <linux/input.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 503 matching lines @@
                    [format](const drm_supported_format& supported_format) {
                      return supported_format.drm_format == format;
                    });
   if (supported_format ==
       (drm_supported_formats + arraysize(drm_supported_formats))) {
     wl_resource_post_error(resource, WL_DRM_ERROR_INVALID_FORMAT,
                            "invalid format 0x%x", format);
     return;
   }
 
-  std::vector<gfx::NativePixmapPlane> planes;
-  planes.emplace_back(stride0, offset0, 0);
-  planes.emplace_back(stride1, offset1, 0);
-  planes.emplace_back(stride2, offset2, 0);
+  std::vector<int> strides{stride0, stride1, stride2};
+  std::vector<int> offsets{offset0, offset1, offset2};
   std::vector<base::ScopedFD> fds;
 
-  size_t num_planes =
+  int planes =
       gfx::NumberOfPlanesForBufferFormat(supported_format->buffer_format);
-  planes.resize(num_planes);
+  strides.resize(planes);
+  offsets.resize(planes);
   fds.push_back(base::ScopedFD(name));
 
   std::unique_ptr<Buffer> buffer =
       GetUserDataAs<Display>(resource)->CreateLinuxDMABufBuffer(
-          gfx::Size(width, height), supported_format->buffer_format, planes,
-          std::move(fds));
+          gfx::Size(width, height), supported_format->buffer_format, strides,
+          offsets, std::move(fds));
   if (!buffer) {
     wl_resource_post_no_memory(resource);
     return;
   }
 
   wl_resource* buffer_resource =
       wl_resource_create(client, &wl_buffer_interface, 1, id);
 
   buffer->set_release_callback(base::Bind(&HandleBufferReleaseCallback,
                                           base::Unretained(buffer_resource)));
@@ skipping 112 matching lines @@
 
   size_t num_planes =
       gfx::NumberOfPlanesForBufferFormat(supported_format->buffer_format);
 
   if (linux_buffer_params->planes.size() != num_planes) {
     wl_resource_post_error(resource, ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_PLANE_IDX,
                            "plane idx out of bounds");
     return;
   }
 
-  std::vector<gfx::NativePixmapPlane> planes;
+  std::vector<int> strides;
+  std::vector<int> offsets;
   std::vector<base::ScopedFD> fds;
 
   for (uint32_t i = 0; i < num_planes; ++i) {
     auto plane_it = linux_buffer_params->planes.find(i);
     if (plane_it == linux_buffer_params->planes.end()) {
       wl_resource_post_error(resource,
                              ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INCOMPLETE,
                              "missing a plane");
       return;
     }
     LinuxBufferParams::Plane& plane = plane_it->second;
-    planes.emplace_back(plane.stride, plane.offset, 0);
+    strides.push_back(plane.stride);
+    offsets.push_back(plane.offset);
     if (plane.fd.is_valid())
       fds.push_back(std::move(plane.fd));
   }
 
   std::unique_ptr<Buffer> buffer =
       linux_buffer_params->display->CreateLinuxDMABufBuffer(
-          gfx::Size(width, height), supported_format->buffer_format, planes,
-          std::move(fds));
+          gfx::Size(width, height), supported_format->buffer_format, strides,
+          offsets, std::move(fds));
   if (!buffer) {
     zwp_linux_buffer_params_v1_send_failed(resource);
     return;
   }
 
   wl_resource* buffer_resource =
       wl_resource_create(client, &wl_buffer_interface, 1, 0);
 
   buffer->set_release_callback(base::Bind(&HandleBufferReleaseCallback,
                                           base::Unretained(buffer_resource)));
@@ skipping 2133 matching lines @@
   DCHECK(event_loop);
   wl_event_loop_dispatch(event_loop, timeout.InMilliseconds());
 }
 
 void Server::Flush() {
   wl_display_flush_clients(wl_display_.get());
 }
 
 }  // namespace wayland
 }  // namespace exo