Title: [229008] releases/WebKitGTK/webkit-2.20/Source/WebCore
- Revision
- 229008
- Author
- [email protected]
- Date
- 2018-02-26 05:14:27 -0800 (Mon, 26 Feb 2018)
Log Message
Merge r228866 - [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.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog (229007 => 229008)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog 2018-02-26 13:14:20 UTC (rev 229007)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog 2018-02-26 13:14:27 UTC (rev 229008)
@@ -1,3 +1,15 @@
+2018-02-21 Philippe Normand <[email protected]>
+
+ [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 <[email protected]>
[RenderTreeBuilder] Move RenderFullScreen::willBeRemoved() mutation logic to RenderTreeBuilder
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (229007 => 229008)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2018-02-26 13:14:20 UTC (rev 229007)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2018-02-26 13:14:27 UTC (rev 229008)
@@ -93,6 +93,7 @@
#if PLATFORM(WAYLAND)
#include "PlatformDisplayWayland.h"
+#include <gst/gl/wayland/gstgldisplay_wayland.h>
#elif PLATFORM(WPE)
#include "PlatformDisplayWPE.h"
#endif
@@ -439,24 +440,32 @@
return true;
auto& sharedDisplay = PlatformDisplay::sharedDisplayForCompositing();
+
if (!m_glDisplay) {
#if PLATFORM(X11)
#if USE(GLX)
- if (is<PlatformDisplayX11>(sharedDisplay))
+ if (is<PlatformDisplayX11>(sharedDisplay)) {
+ GST_DEBUG("Creating X11 shared GL display");
m_glDisplay = GST_GL_DISPLAY(gst_gl_display_x11_new_with_display(downcast<PlatformDisplayX11>(sharedDisplay).native()));
+ }
#elif USE(EGL)
- if (is<PlatformDisplayX11>(sharedDisplay))
+ if (is<PlatformDisplayX11>(sharedDisplay)) {
+ GST_DEBUG("Creating X11 shared EGL display");
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))
- m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayWayland>(sharedDisplay).eglDisplay()));
+ 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()));
+ }
#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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
