Title: [229020] releases/WebKitGTK/webkit-2.20/Source/WebCore
- Revision
- 229020
- Author
- [email protected]
- Date
- 2018-02-26 06:19:29 -0800 (Mon, 26 Feb 2018)
Log Message
Revert "Merge r228866 - [GStreamer] Create a Wayland GL display instead of EGL"
This reverts commit ae0522d9bdcd6cb914d9a475abdf17172bd9be4a.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog (229019 => 229020)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog 2018-02-26 14:19:23 UTC (rev 229019)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog 2018-02-26 14:19:29 UTC (rev 229020)
@@ -107,18 +107,6 @@
* crypto/gcrypt/CryptoKeyRSAGCrypt.cpp:
(WebCore::CryptoKeyRSA::exportData const): remove assertion.
-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 (229019 => 229020)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2018-02-26 14:19:23 UTC (rev 229019)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2018-02-26 14:19:29 UTC (rev 229020)
@@ -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 @@
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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
