Attachment 371401 Details for Bug 198567 – Patch

[patch] Patch

bug-198567-20190605105606.patch (text/plain), 3.04 KB, created by Michael Catanzaro on 2019-06-05 08:56:07 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2019-06-05 08:56:07 PDT

Size: 3.04 KB

patch

obsolete

>Subversion Revision: 246104
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 9e7d226de2ddffe2b80e5067f84fbf780fb64f65..67cf308c8cd7a4219aa19430dd350642cf639797 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,23 @@
>+2019-06-05  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [GStreamer] Crash in MediaPlayerPrivateGStreamerBase::ensureGstGLContext
>+        https://bugs.webkit.org/show_bug.cgi?id=198567
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-01  Antoine Quint  <graouts@apple.com>
> 
>         [Pointer Events] Add support for chorded button interactions
>diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>index f0b7a43dd8a49aa0df62fd827896588ff1b78bd3..496619bcf4e07941f453f7f978ed0eb20ad8cd82 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>@@ -451,12 +451,13 @@ bool MediaPlayerPrivateGStreamerBase::ensureGstGLContext()
> #endif
> 
> #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
> 
>         ASSERT(m_glDisplay);

Actions: View | Formatted Diff | Diff

Attachments on bug 198567: 371401