Fix crash on macOS

The recent chromium changes caches different displays and perform a
deferred wait operation, which leads to accessing command buffers from
different threads, as the QtWebengine invokes these deferred wait calls
from the main thread. The current fix attempt is to not defer the calls
and execute them on the current thread itself.

amends 2e0bedfdf9aa7d9b7d3995410b251da39eb4de91

Fixes: QTBUG-128846
Change-Id: Iaf97121a626369bdec3879a3b61b7bb20e5a9241
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/596078
Reviewed-by: Michal Klocek <[email protected]>

Author: Anu Aliyas

chromium/gpu/command_buffer/service/shared_image/iosurface_image_backing.h

@@ -141,10 +141,14 @@ class GPU_GLES2_EXPORT IOSurfaceImageBacking
   void WaitForDawnCommandsToBeScheduled(const wgpu::Device& device_to_exclude);
 #endif
 
+#if !BUILDFLAG(IS_QTWEBENGINE)
   void AddEGLDisplayWithPendingCommands(gl::GLDisplayEGL* display);
+#endif
   void WaitForANGLECommandsToBeScheduled();
+#if !BUILDFLAG(IS_QTWEBENGINE)
   void ClearEGLDisplaysWithPendingCommands(
       gl::GLDisplayEGL* display_to_exclude);
+#endif
 
   std::unique_ptr<gfx::GpuFence> GetLastWriteGpuFence();
   void SetReleaseFence(gfx::GpuFenceHandle release_fence);

chromium/gpu/command_buffer/service/shared_image/iosurface_image_backing.mm

@@ -1405,23 +1405,34 @@ new IOSurfaceBackingEGLState(this, egl_display, context,
 }
 #endif  // BUILDFLAG(USE_DAWN)
 
+#if !BUILDFLAG(IS_QTWEBENGINE)
 void IOSurfaceImageBacking::AddEGLDisplayWithPendingCommands(
     gl::GLDisplayEGL* display) {
   egl_displays_pending_flush_.insert(display);
 }
+#endif
 
 void IOSurfaceImageBacking::WaitForANGLECommandsToBeScheduled() {
+#if !BUILDFLAG(IS_QTWEBENGINE)
   for (auto* display : std::move(egl_displays_pending_flush_)) {
     eglWaitUntilWorkScheduledANGLE(display->GetDisplay());
   }
+#else
+  gl::GLDisplayEGL* display = gl::GLDisplayEGL::GetDisplayForCurrentContext();
+  if (display) {
+    eglWaitUntilWorkScheduledANGLE(display->GetDisplay());
+  }
+#endif
 }
 
+#if !BUILDFLAG(IS_QTWEBENGINE)
 void IOSurfaceImageBacking::ClearEGLDisplaysWithPendingCommands(
     gl::GLDisplayEGL* display_to_exclude) {
   if (std::move(egl_displays_pending_flush_).contains(display_to_exclude)) {
     egl_displays_pending_flush_.insert(display_to_exclude);
   }
 }
+#endif
 
 #if BUILDFLAG(USE_DAWN)
 std::unique_ptr<DawnImageRepresentation> IOSurfaceImageBacking::ProduceDawn(
@@ -1738,8 +1749,9 @@ new IOSurfaceBackingEGLState(this, egl_display, context,
   // Note that we don't need to call WaitForANGLECommandsToBeScheduled for other
   // EGLDisplays because it is already done when the previous GL context is made
   // uncurrent. We can simply remove the other EGLDisplays from the list.
+#if !BUILDFLAG(IS_QTWEBENGINE)
   ClearEGLDisplaysWithPendingCommands(/*display_to_exclude=*/display);
-
+#endif
   if (gl::GetANGLEImplementation() == gl::ANGLEImplementation::kMetal) {
     // If this image could potentially be shared with another Metal device,
     // it's necessary to synchronize between the two devices. If any Metal
@@ -1857,7 +1869,11 @@ new IOSurfaceBackingEGLState(this, egl_display, context,
   // IOSurface synchronization by the kernel e.g. using waitUntilScheduled on
   // Metal or glFlush on OpenGL. Defer the call until CoreAnimation, Dawn,
   // or another ANGLE EGLDisplay needs to access to avoid unnecessary overhead.
+#if !BUILDFLAG(IS_QTWEBENGINE)
   AddEGLDisplayWithPendingCommands(display);
+#else
+  eglWaitUntilWorkScheduledANGLE(display->GetDisplay());
+#endif
 
   // When SwANGLE is used as the GL implementation, it holds an internal
   // texture. We have to call ReleaseTexImage here to trigger a copy from that