[GL] Eliminate GLImageEGLPixmap and helper class taking in BufferFormat

Following recent refactorings, these classes no longer need to know about BufferFormat for any reason. Bug: 1412693 Change-Id: I8a3c29f6a9bfaa48925a4f6825c2ef6917b883a5 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4316315 Reviewed-by: Frank Liberato <liberato@chromium.org> Reviewed-by: ccameron chromium <ccameron@chromium.org> Commit-Queue: Colin Blundell <blundell@chromium.org> Cr-Commit-Position: refs/heads/main@{#1115591}
chromium · Mar 10, 2023 · 441da7a · 441da7a
1 parent f8a327c
commit 441da7a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 18 deletions.
diff --git a/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.cc b/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.cc
@@ -101,7 +101,7 @@ VaapiStatus VaapiPictureNativePixmapAngle::Allocate(gfx::BufferFormat format) {
     return VaapiStatus::Codes::kBadContext;
 
   auto image = base::WrapRefCounted<gl::GLImageEGLPixmap>(
-      new gl::GLImageEGLPixmap(visible_size_, format));
+      new gl::GLImageEGLPixmap(visible_size_));
   if (!image)
     return VaapiStatus::Codes::kNoImage;
 

diff --git a/ui/gl/gl_image_egl_pixmap.cc b/ui/gl/gl_image_egl_pixmap.cc
@@ -6,9 +6,8 @@
 
 namespace gl {
 
-GLImageEGLPixmap::GLImageEGLPixmap(const gfx::Size& size,
-                                   gfx::BufferFormat format)
-    : binding_helper_(size, format) {}
+GLImageEGLPixmap::GLImageEGLPixmap(const gfx::Size& size)
+    : binding_helper_(size) {}
 
 GLImageEGLPixmap::~GLImageEGLPixmap() = default;
 

diff --git a/ui/gl/gl_image_egl_pixmap.h b/ui/gl/gl_image_egl_pixmap.h
@@ -5,7 +5,6 @@
 #ifndef UI_GL_GL_IMAGE_EGL_PIXMAP_H_
 #define UI_GL_GL_IMAGE_EGL_PIXMAP_H_
 
-#include "ui/gfx/buffer_types.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/x/glx.h"
 #include "ui/gl/gl_export.h"
@@ -24,7 +23,7 @@ class GL_EXPORT GLImageEGLPixmap : public GLImage {
  private:
   friend class media::VaapiPictureNativePixmapAngle;
 
-  GLImageEGLPixmap(const gfx::Size& size, gfx::BufferFormat format);
+  explicit GLImageEGLPixmap(const gfx::Size& size);
 
   GLImageEGLPixmap(const GLImageEGLPixmap&) = delete;
   GLImageEGLPixmap& operator=(const GLImageEGLPixmap&) = delete;

diff --git a/ui/gl/native_pixmap_egl_x11_binding_helper.cc b/ui/gl/native_pixmap_egl_x11_binding_helper.cc
@@ -7,7 +7,6 @@
 #include <memory>
 
 #include "ui/gfx/x/connection.h"
-#include "ui/gl/buffer_format_utils.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace gl {
@@ -18,9 +17,8 @@ inline EGLDisplay FromXDisplay() {
 }
 
 NativePixmapEGLX11BindingHelper::NativePixmapEGLX11BindingHelper(
-    const gfx::Size& size,
-    gfx::BufferFormat format)
-    : size_(size), format_(format), display_(FromXDisplay()) {}
+    const gfx::Size& size)
+    : size_(size), display_(FromXDisplay()) {}
 
 NativePixmapEGLX11BindingHelper::~NativePixmapEGLX11BindingHelper() {
   if (surface_) {

diff --git a/ui/gl/native_pixmap_egl_x11_binding_helper.h b/ui/gl/native_pixmap_egl_x11_binding_helper.h
@@ -7,7 +7,6 @@
 
 #include <stdint.h>
 
-#include "ui/gfx/buffer_types.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/x/glx.h"
 #include "ui/gl/gl_export.h"
@@ -19,8 +18,7 @@ namespace gl {
 
 class GL_EXPORT NativePixmapEGLX11BindingHelper {
  public:
-  NativePixmapEGLX11BindingHelper(const gfx::Size& size,
-                                  gfx::BufferFormat format);
+  explicit NativePixmapEGLX11BindingHelper(const gfx::Size& size);
 
   NativePixmapEGLX11BindingHelper(const NativePixmapEGLX11BindingHelper&) =
       delete;
@@ -41,11 +39,8 @@ class GL_EXPORT NativePixmapEGLX11BindingHelper {
   ~NativePixmapEGLX11BindingHelper();
 
  private:
-  gfx::BufferFormat format() const { return format_; }
-
   EGLSurface surface_ = nullptr;
   const gfx::Size size_;
-  gfx::BufferFormat format_;
   EGLDisplay display_;
 };
 

diff --git a/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.cc b/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.cc
@@ -174,8 +174,8 @@ std::unique_ptr<NativePixmapGLBinding> NativePixmapEGLX11Binding::Create(
     return nullptr;
   }
 
-  auto binding_helper = std::make_unique<gl::NativePixmapEGLX11BindingHelper>(
-      plane_size, plane_format);
+  auto binding_helper =
+      std::make_unique<gl::NativePixmapEGLX11BindingHelper>(plane_size);
   x11::Pixmap pixmap =
       gl::XPixmapFromNativePixmap(*native_pixmap, plane_format);
   if (pixmap == x11::Pixmap::None) {