Revert of Add format modifier IDs for EGL_EXT_image_dma_buf_import extension

ui/ozone/platform/drm/gpu/gbm_buffer.h

 // 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.
 
 #ifndef UI_OZONE_PLATFORM_DRM_GPU_GBM_BUFFER_H_
 #define UI_OZONE_PLATFORM_DRM_GPU_GBM_BUFFER_H_
 
 #include <vector>
 
 #include "base/files/scoped_file.h"
@@ skipping 15 matching lines @@
   static scoped_refptr<GbmBuffer> CreateBuffer(
       const scoped_refptr<GbmDevice>& gbm,
       gfx::BufferFormat format,
       const gfx::Size& size,
       gfx::BufferUsage usage);
   static scoped_refptr<GbmBuffer> CreateBufferFromFds(
       const scoped_refptr<GbmDevice>& gbm,
       gfx::BufferFormat format,
       const gfx::Size& size,
       std::vector<base::ScopedFD>&& fds,
-      const std::vector<gfx::NativePixmapPlane>& planes);
+      const std::vector<int>& strides,
+      const std::vector<int>& offsets);
   gfx::BufferFormat GetFormat() const { return format_; }
   gfx::BufferUsage GetUsage() const { return usage_; }
   bool AreFdsValid() const;
   size_t GetFdCount() const;
   int GetFd(size_t plane) const;
   int GetStride(size_t plane) const;
   int GetOffset(size_t plane) const;
-  uint64_t GetFormatModifier(size_t plane) const;
   gfx::Size GetSize() const override;
 
  private:
   GbmBuffer(const scoped_refptr<GbmDevice>& gbm,
             gbm_bo* bo,
             gfx::BufferFormat format,
             gfx::BufferUsage usage,
             std::vector<base::ScopedFD>&& fds,
             const gfx::Size& size,
-            const std::vector<gfx::NativePixmapPlane>&& planes);
+            const std::vector<int>& strides,
+            const std::vector<int>& offsets);
   ~GbmBuffer() override;
 
   gfx::BufferFormat format_;
   gfx::BufferUsage usage_;
   std::vector<base::ScopedFD> fds_;
   gfx::Size size_;
-
-  std::vector<gfx::NativePixmapPlane> planes_;
+  std::vector<int> strides_;
+  std::vector<int> offsets_;
 
   DISALLOW_COPY_AND_ASSIGN(GbmBuffer);
 };
 
 class GbmPixmap : public NativePixmap {
  public:
   GbmPixmap(GbmSurfaceFactory* surface_manager,
             const scoped_refptr<GbmBuffer>& buffer);
 
   void SetProcessingCallback(
       const ProcessingCallback& processing_callback) override;
 
   // NativePixmap:
   void* GetEGLClientBuffer() const override;
   bool AreDmaBufFdsValid() const override;
   size_t GetDmaBufFdCount() const override;
   int GetDmaBufFd(size_t plane) const override;
   int GetDmaBufPitch(size_t plane) const override;
   int GetDmaBufOffset(size_t plane) const override;
-  uint64_t GetDmaBufModifier(size_t plane) const override;
   gfx::BufferFormat GetBufferFormat() const override;
   gfx::Size GetBufferSize() const override;
   bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
                             int plane_z_order,
                             gfx::OverlayTransform plane_transform,
                             const gfx::Rect& display_bounds,
                             const gfx::RectF& crop_rect) override;
   gfx::NativePixmapHandle ExportHandle() override;
 
   scoped_refptr<GbmBuffer> buffer() { return buffer_; }
@@ skipping 10 matching lines @@
   // this Pixmap. This holds the processed buffer.
   scoped_refptr<GbmPixmap> processed_pixmap_;
   ProcessingCallback processing_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(GbmPixmap);
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_PLATFORM_DRM_GPU_GBM_BUFFER_H_