1 files changed, 29 insertions, 1 deletions
diff --git a/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc b/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc
index 25084920ab82..2ac95f9a102a 100644
--- a/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc
+++ b/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc
@@ -1,4 +1,4 @@
---- ui/base/x/x11_shm_image_pool.cc.orig	2021-04-14 18:41:37 UTC
+--- ui/base/x/x11_shm_image_pool.cc.orig	2022-02-07 13:39:41 UTC
 +++ ui/base/x/x11_shm_image_pool.cc
 @@ -16,6 +16,7 @@
  #include "base/environment.h"
@@ -23,3 +23,31 @@
  }
  
  std::size_t MaxShmSegmentSize() {
+@@ -66,6 +71,9 @@ bool IsRemoteHost(const std::string& name) {
+ }
+ 
+ bool ShouldUseMitShm(x11::Connection* connection) {
++#if defined(OS_BSD)
++  return false;
++#endif
+   // MIT-SHM may be available on remote connetions, but it will be unusable.  Do
+   // a best-effort check to see if the host is remote to disable the SHM
+   // codepath.  It may be possible in contrived cases for there to be a
+@@ -184,7 +192,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size
+         shmctl(state.shmid, IPC_RMID, nullptr);
+         return false;
+       }
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+       // On Linux, a shmid can still be attached after IPC_RMID if otherwise
+       // kept alive.  Detach before XShmAttach to prevent a memory leak in case
+       // the process dies.
+@@ -203,7 +211,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size
+         return false;
+       state.shmseg = shmseg;
+       state.shmem_attached_to_server = true;
+-#if !defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD)
+       // The Linux-specific shmctl behavior above may not be portable, so we're
+       // forced to do IPC_RMID after the server has attached to the segment.
+       shmctl(state.shmid, IPC_RMID, nullptr);