Changeset 246107 in webkit

Timestamp:

Jun 5, 2019, 9:41:05 AM (7 years ago)

Author:

Michael Catanzaro

Message:

[GStreamer] Crash in MediaPlayerPrivateGStreamerBase::ensureGstGLContext
​https://bugs.webkit.org/show_bug.cgi?id=198567

Reviewed by Philippe Normand.

MediaPlayerPrivateGStreamerBase::ensureGstGLContext is currently a guaranteed crash because
it expects PlatformDisplay::sharedDisplayForCompositing() to return a PlatformDisplayLibWPE
if compiled with USE(WPE_RENDERER), but PlatformDisplayLibWPE has lower precedence than
PlatformDisplayX11 and PlatformDisplayWayland. When running our layout tests with
run-webkit-tests --gtk, it's guaranteed to be a PlatformDisplayX11.

I think Carlos was clearly expecting PlatformDisplayLibWPE, so I don't know what the ideal
desired behavior is, but the crashes go away if we change the code to allow any type of
PlatformDisplay. This should hopefully fix our bots, which are still exiting early.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:

(WebCore::MediaPlayerPrivateGStreamerBase::ensureGstGLContext):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-05  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [GStreamer] Crash in MediaPlayerPrivateGStreamerBase::ensureGstGLContext
+        https://bugs.webkit.org/show_bug.cgi?id=198567
+
+        Reviewed by Philippe Normand.
+
+        MediaPlayerPrivateGStreamerBase::ensureGstGLContext is currently a guaranteed crash because
+        it expects PlatformDisplay::sharedDisplayForCompositing() to return a PlatformDisplayLibWPE
+        if compiled with USE(WPE_RENDERER), but PlatformDisplayLibWPE has lower precedence than
+        PlatformDisplayX11 and PlatformDisplayWayland. When running our layout tests with
+        run-webkit-tests --gtk, it's guaranteed to be a PlatformDisplayX11.
+
+        I think Carlos was clearly expecting PlatformDisplayLibWPE, so I don't know what the ideal
+        desired behavior is, but the crashes go away if we change the code to allow any type of
+        PlatformDisplay. This should hopefully fix our bots, which are still exiting early.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+        (WebCore::MediaPlayerPrivateGStreamerBase::ensureGstGLContext):
+
 2019-06-05  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp

@@ -452 +452 @@
 
 #if USE(WPE_RENDERER)
-        ASSERT(is<PlatformDisplayLibWPE>(sharedDisplay));
-        GST_DEBUG_OBJECT(pipeline(), "Creating WPE shared EGL display");
-        if (shouldAdoptRef)
-            m_glDisplay = adoptGRef(GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayLibWPE>(sharedDisplay).eglDisplay())));
-        else
-            m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayLibWPE>(sharedDisplay).eglDisplay()));
+        if (is<PlatformDisplayLibWPE>(sharedDisplay)) {
+            GST_DEBUG_OBJECT(pipeline(), "Creating WPE shared EGL display");
+            if (shouldAdoptRef)
+                m_glDisplay = adoptGRef(GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayLibWPE>(sharedDisplay).eglDisplay())));
+            else
+                m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayLibWPE>(sharedDisplay).eglDisplay()));
+        }
 #endif