File 0001-230922-Free-the-X11-pixmap-in-the-NativePi... of Package chromium122

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-230922-Free-the-X11-pixmap-in-the-NativePixmapEGLX11Binding-destructor.patch of Package chromium122

Index: chromium_vaapi/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.cc
===================================================================
--- chromium_vaapi.orig/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.cc
+++ chromium_vaapi/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.cc
@@ -147,17 +147,9 @@ NativePixmapEGLX11Binding::~NativePixmap
   if (surface_) {
     eglDestroySurface(display_, surface_);
   }
-
-  if (pixmap_ != x11::Pixmap::None) {
-    auto* connection = x11::Connection::Get();
-    connection->FreePixmap({pixmap_});
-  }
 }
 
 bool NativePixmapEGLX11Binding::Initialize(x11::Pixmap pixmap) {
-  CHECK_NE(pixmap, x11::Pixmap::None);
-  pixmap_ = pixmap;
-
   if (eglInitialize(display_, nullptr, nullptr) != EGL_TRUE) {
     return false;
   }
@@ -231,7 +223,9 @@ std::unique_ptr<NativePixmapGLBinding> N
     return nullptr;
   }
 
-  // Transfer the ownership of `pixmap` to `NativePixmapEGLX11Binding`.
+  // TODO(https://crbug.com/1411749): if we early out below, should we call
+  // FreePixmap()?
+
   if (!binding->Initialize(std::move(pixmap))) {
     VLOG(1) << "Unable to initialize binding from pixmap";
     return nullptr;
Index: chromium_vaapi/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.h
===================================================================
--- chromium_vaapi.orig/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.h
+++ chromium_vaapi/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.h
@@ -47,8 +47,6 @@ class NativePixmapEGLX11Binding : public
   EGLSurface surface_ = nullptr;
   EGLDisplay display_;
   gfx::BufferFormat format_;
-
-  x11::Pixmap pixmap_ = x11::Pixmap::None;
 };
 
 }  // namespace ui

Places

File 0001-230922-Free-the-X11-pixmap-in-the-NativePixmapEGLX11Binding-destructor.patch of Package chromium122

Places