Title: [206432] trunk/Source/WebCore
- Revision
- 206432
- Author
- commit-qu...@webkit.org
- Date
- 2016-09-27 06:20:16 -0700 (Tue, 27 Sep 2016)
Log Message
Build fails for X11+EGL due to missing gst_gl_display_x11_new_with_display()
https://bugs.webkit.org/show_bug.cgi?id=162606
Patch by Mario Sanchez Prada <ma...@endlessm.com> on 2016-09-27
Reviewed by Gustavo Noronha Silva.
Use the right check to retrieve the right instance of GstGLDisplay
depending on whether we're using GLX or EGL, not X11 or Wayland.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::ensureGstGLContext):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (206431 => 206432)
--- trunk/Source/WebCore/ChangeLog 2016-09-27 13:11:13 UTC (rev 206431)
+++ trunk/Source/WebCore/ChangeLog 2016-09-27 13:20:16 UTC (rev 206432)
@@ -1,3 +1,16 @@
+2016-09-27 Mario Sanchez Prada <ma...@endlessm.com>
+
+ Build fails for X11+EGL due to missing gst_gl_display_x11_new_with_display()
+ https://bugs.webkit.org/show_bug.cgi?id=162606
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Use the right check to retrieve the right instance of GstGLDisplay
+ depending on whether we're using GLX or EGL, not X11 or Wayland.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerBase::ensureGstGLContext):
+
2016-09-27 Youenn Fablet <you...@apple.com>
[GTK][EFL] imported/w3c/web-platform-tests/fetch/api/basic/accept-header.html is failing
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (206431 => 206432)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2016-09-27 13:11:13 UTC (rev 206431)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2016-09-27 13:20:16 UTC (rev 206432)
@@ -255,7 +255,11 @@
auto& sharedDisplay = PlatformDisplay::sharedDisplayForCompositing();
if (!m_glDisplay) {
#if PLATFORM(X11)
+#if USE(GLX)
m_glDisplay = GST_GL_DISPLAY(gst_gl_display_x11_new_with_display(downcast<PlatformDisplayX11>(sharedDisplay).native()));
+#elif USE(EGL)
+ m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayX11>(sharedDisplay).native()));
+#endif
#elif PLATFORM(WAYLAND)
m_glDisplay = GST_GL_DISPLAY(gst_gl_display_egl_new_with_egl_display(downcast<PlatformDisplayWayland>(sharedDisplay).native()));
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
