diff --git a/.chromium.metadata b/.chromium.metadata index 00261959..41fff71c 100644 --- a/.chromium.metadata +++ b/.chromium.metadata @@ -1,4 +1,4 @@ -0fd76c55af67029bcf78087de9e05aedb4ba2877 SOURCES/chromium-117.0.5938.88.tar.xz +dcbf220843cb4c05f84f4a1530e58f9c16277fda SOURCES/chromium-117.0.5938.92.tar.xz dea187019741602d57aaf189a80abba261fbd2aa SOURCES/linux-x64-0.19.2.tgz 7e5d2c7864c5c83ec789b59c77cd9c20d2594916 SOURCES/linux-arm64-0.19.2.tgz 769196d081c6a0ad37f1c63dec56febfff3370de SOURCES/node-v20.6.1-linux-x64.tar.xz diff --git a/.gitignore b/.gitignore index 453db803..51ec3585 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -SOURCES/chromium-117.0.5938.88.tar.xz +SOURCES/chromium-117.0.5938.92.tar.xz SOURCES/linux-x64-0.19.2.tgz SOURCES/linux-arm64-0.19.2.tgz SOURCES/node-v20.6.1-linux-x64.tar.xz diff --git a/SOURCES/chromium-117-memory_leak_in_xserver.patch b/SOURCES/chromium-117-memory_leak_in_xserver.patch new file mode 100644 index 00000000..35cc5641 --- /dev/null +++ b/SOURCES/chromium-117-memory_leak_in_xserver.patch @@ -0,0 +1,63 @@ +commit 42d57d016f5fb6d2a1a354743b9be911c1be87e8 +Author: Jianhui Dai +Date: Fri Sep 22 21:30:04 2023 +0000 + + [GL] Free the X11 pixmap in the NativePixmapEGLX11Binding destructor + + This CL frees the X11 pixmap in the NativePixmapEGLX11Binding destructor + to prevent a memory leak in the X server. + + Bug: 1467689 + Change-Id: Id4cba30825417db52176f9165db34d7234a05a05 + Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4886249 + Reviewed-by: Ted (Chromium) Meyer + Commit-Queue: Ted (Chromium) Meyer + Reviewed-by: Maksim Sisov + Cr-Commit-Position: refs/heads/main@{#1200486} + +diff --git a/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.cc b/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.cc +index 46a2d3274b924..b46eb67b9de60 100644 +--- a/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.cc ++++ b/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.cc +@@ -147,9 +147,17 @@ NativePixmapEGLX11Binding::~NativePixmapEGLX11Binding() { + 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; + } +@@ -223,9 +231,7 @@ std::unique_ptr NativePixmapEGLX11Binding::Create( + return nullptr; + } + +- // TODO(https://crbug.com/1411749): if we early out below, should we call +- // FreePixmap()? +- ++ // Transfer the ownership of `pixmap` to `NativePixmapEGLX11Binding`. + if (!binding->Initialize(std::move(pixmap))) { + VLOG(1) << "Unable to initialize binding from pixmap"; + return nullptr; +diff --git a/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.h b/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.h +index 013df3f776acc..99b262b82ce9d 100644 +--- a/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.h ++++ b/ui/ozone/platform/x11/native_pixmap_egl_x11_binding.h +@@ -47,6 +47,8 @@ class NativePixmapEGLX11Binding : public NativePixmapGLBinding { + EGLSurface surface_ = nullptr; + EGLDisplay display_; + gfx::BufferFormat format_; ++ ++ x11::Pixmap pixmap_ = x11::Pixmap::None; + }; + + } // namespace ui diff --git a/SPECS/chromium.spec b/SPECS/chromium.spec index a1efd687..1fc1e56d 100644 --- a/SPECS/chromium.spec +++ b/SPECS/chromium.spec @@ -238,7 +238,7 @@ %endif Name: chromium%{chromium_channel} -Version: 117.0.5938.88 +Version: 117.0.5938.92 Release: 1%{?dist}.inferit Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Url: http://www.chromium.org/Home @@ -375,6 +375,9 @@ Patch350: chromium-116-tweak_about_gpu.patch # build error Patch351: chromium-117-mnemonic-error.patch +# upstream patches +Patch400: chromium-117-memory_leak_in_xserver.patch + # Yandex Search by default Patch500: 0001-Yandex-as-default-search-engine.patch # MSVSphere @@ -1000,6 +1003,8 @@ udev. %patch -P350 -p1 -b .tweak_about_gpu %patch -P351 -p1 -b .mnemonic-error +%patch -P400 -p1 -b .memory_leak_in_xserve + %patch -P500 -p1 -b .Yandex-as-default-search-engine %patch -P501 -p1 -b .Added-Russian-description-and-summary-for-gnome-soft @@ -1704,6 +1709,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %{chromium_path}/chromedriver %changelog +* Mon Sep 25 2023 Arkady L. Shane - 117.0.5938.92-1.inferit +- Update to 117.0.5938.92 +- backport upstream patch to fix memory leak + * Tue Sep 19 2023 Arkady L. Shane - 117.0.5938.88-1.inferit - Update to 117.0.5938.88 - Build with internal libwebp