Changeset 260244 in webkit

Timestamp:

Apr 17, 2020 5:53:09 AM (4 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] UI process crash when entering compositing mode when WPE_RENDERER is enabled
​https://bugs.webkit.org/show_bug.cgi?id=209118

Reviewed by Michael Catanzaro.

Check if EGL_WL_bind_wayland_display extension is available when using WPE_RENDERER, since we don't suport the
SHM interface.

• UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:

(WebKit::AcceleratedBackingStoreWayland::checkRequirements): Return false if EGL_WL_bind_wayland_display is not present.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/gtk/AcceleratedBackingStoreWayland.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-17  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] UI process crash when entering compositing mode when WPE_RENDERER is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=209118
+
+        Reviewed by Michael Catanzaro.
+
+        Check if EGL_WL_bind_wayland_display extension is available when using WPE_RENDERER, since we don't suport the
+        SHM interface.
+
+        * UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
+        (WebKit::AcceleratedBackingStoreWayland::checkRequirements): Return false if EGL_WL_bind_wayland_display is not present.
+
 2020-04-17  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp

@@ -93 +93 @@
 #if USE(WPE_RENDERER)
     if (!glImageTargetTexture2D) {
-        if (!wpe_fdo_initialize_for_egl_display(PlatformDisplay::sharedDisplay().eglDisplay()))
+        auto* eglDisplay = PlatformDisplay::sharedDisplay().eglDisplay();
+        const char* extensions = eglQueryString(eglDisplay, EGL_EXTENSIONS);
+        if (!GLContext::isExtensionSupported(extensions, "EGL_WL_bind_wayland_display"))
+            return false;
+
+        if (!wpe_fdo_initialize_for_egl_display(eglDisplay))
             return false;