Revert "Merge r228866 - [GStreamer] Create a Wayland GL display inste…

…ad of EGL" This reverts commit ae0522d9bdcd6cb914d9a475abdf17172bd9be4a.
WebKit · Feb 26, 2018 · 37eb33e · 37eb33e
1 parent f0f3697
commit 37eb33e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 25 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -107,18 +107,6 @@
         * crypto/gcrypt/CryptoKeyRSAGCrypt.cpp:
         (WebCore::CryptoKeyRSA::exportData const): remove assertion.
 
-2018-02-21  Philippe Normand  <pnormand@igalia.com>
-
-        [GStreamer] Create a Wayland GL display instead of EGL
-        https://bugs.webkit.org/show_bug.cgi?id=182968
-
-        Reviewed by Xabier Rodriguez-Calvar.
-
-        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
-        (WebCore::MediaPlayerPrivateGStreamerBase::ensureGstGLContext):
-        Add logging and instantiate a GstDisplayWayland display instead of
-        an EGL display when running under a Wayland compositor.
-
 2018-02-21  Zalan Bujtas  <zalan@apple.com>
 
         [RenderTreeBuilder] Move RenderFullScreen::willBeRemoved() mutation logic to RenderTreeBuilder

diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
@@ -93,7 +93,6 @@
 
 #if PLATFORM(WAYLAND)
 #include "PlatformDisplayWayland.h"
-#include <gst/gl/wayland/gstgldisplay_wayland.h>
 #elif PLATFORM(WPE)
 #include "PlatformDisplayWPE.h"
 #endif
@@ -440,32 +439,24 @@ bool MediaPlayerPrivateGStreamerBase::ensureGstGLContext()
         return true;
 
     auto& sharedDisplay = PlatformDisplay::sharedDisplayForCompositing();
-
     if (!m_glDisplay) {
 #if PLATFORM(X11)
 #if USE(GLX)
-        if (is<PlatformDisplayX11>(sharedDisplay)) {
-            GST_DEBUG("Creating X11 shared GL display");
+        if (is<PlatformDisplayX11>(sharedDisplay))
             m_glDisplay = GST_GL_DISPLAY(gst_gl_display_x11_new_with_display(downcast<PlatformDisplayX11>(sharedDisplay).native()));
-        }
 #elif USE(EGL)
-        if (is<PlatformDisplayX11>(sharedDisplay)) {
-            GST_DEBUG("Creating X11 shared EGL display");
+        if (is<PlatformDisplayX11>(sharedDisplay))
             m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayX11>(sharedDisplay).eglDisplay()));
-        }
 #endif
 #endif
 
 #if PLATFORM(WAYLAND)
-        if (is<PlatformDisplayWayland>(sharedDisplay)) {
-            GST_DEBUG("Creating Wayland shared display");
-            m_glDisplay = GST_GL_DISPLAY(gst_gl_display_wayland_new_with_display(downcast<PlatformDisplayWayland>(sharedDisplay).native()));
-        }
+        if (is<PlatformDisplayWayland>(sharedDisplay))
+            m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayWayland>(sharedDisplay).eglDisplay()));
 #endif
 
 #if PLATFORM(WPE)
         ASSERT(is<PlatformDisplayWPE>(sharedDisplay));
-        GST_DEBUG("Creating WPE shared EGL display");
         m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayWPE>(sharedDisplay).eglDisplay()));
 #endif