Title: [254904] releases/WebKitGTK/webkit-2.26/Source/WebCore
- Revision
- 254904
- Author
- [email protected]
- Date
- 2020-01-22 02:19:39 -0800 (Wed, 22 Jan 2020)
Log Message
Merge r253284 - [GStreamer] Crashes in MediaPlayerPrivateGStreamer::ensureGstGLContext
https://bugs.webkit.org/show_bug.cgi?id=204848
Reviewed by Michael Catanzaro.
Make sure the GL video sink uses a valid WebKit shared GL context.
* platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp:
(ensureGstGLContext):
(webKitGLVideoSinkProbePlatform):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.26/Source/WebCore/ChangeLog (254903 => 254904)
--- releases/WebKitGTK/webkit-2.26/Source/WebCore/ChangeLog 2020-01-22 10:19:34 UTC (rev 254903)
+++ releases/WebKitGTK/webkit-2.26/Source/WebCore/ChangeLog 2020-01-22 10:19:39 UTC (rev 254904)
@@ -1,3 +1,16 @@
+2019-12-09 Philippe Normand <[email protected]>
+
+ [GStreamer] Crashes in MediaPlayerPrivateGStreamer::ensureGstGLContext
+ https://bugs.webkit.org/show_bug.cgi?id=204848
+
+ Reviewed by Michael Catanzaro.
+
+ Make sure the GL video sink uses a valid WebKit shared GL context.
+
+ * platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp:
+ (ensureGstGLContext):
+ (webKitGLVideoSinkProbePlatform):
+
2019-10-28 Zalan Bujtas <[email protected]>
Hidden framesets should provide default edgeInfo value
Modified: releases/WebKitGTK/webkit-2.26/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (254903 => 254904)
--- releases/WebKitGTK/webkit-2.26/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2020-01-22 10:19:34 UTC (rev 254903)
+++ releases/WebKitGTK/webkit-2.26/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2020-01-22 10:19:39 UTC (rev 254904)
@@ -447,6 +447,9 @@
}
GLContext* webkitContext = sharedDisplay.sharingGLContext();
+ if (!webkitContext)
+ return false;
+
// EGL and GLX are mutually exclusive, no need for ifdefs here.
GstGLPlatform glPlatform = webkitContext->isEGLContext() ? GST_GL_PLATFORM_EGL : GST_GL_PLATFORM_GLX;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
