Title: [248408] releases/WebKitGTK/webkit-2.24/Source/WebCore
- Revision
- 248408
- Author
- [email protected]
- Date
- 2019-08-08 07:53:40 -0700 (Thu, 08 Aug 2019)
Log Message
Merge r248405 - [GTK] WebKitWebProcess crashes when viewing an HTML with a <video> element referencing unknown file
https://bugs.webkit.org/show_bug.cgi?id=200530
Reviewed by Xabier Rodriguez-Calvar.
Not amenable to unit testing.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::fillTimerFired):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog (248407 => 248408)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog 2019-08-08 14:20:19 UTC (rev 248407)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog 2019-08-08 14:53:40 UTC (rev 248408)
@@ -1,3 +1,15 @@
+2019-08-08 Charlie Turner <[email protected]>
+
+ [GTK] WebKitWebProcess crashes when viewing an HTML with a <video> element referencing unknown file
+ https://bugs.webkit.org/show_bug.cgi?id=200530
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ Not amenable to unit testing.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::fillTimerFired):
+
2019-08-02 Ryosuke Niwa <[email protected]>
Harden NodeRareData::m_connectedFrameCount
Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (248407 => 248408)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2019-08-08 14:20:19 UTC (rev 248407)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2019-08-08 14:53:40 UTC (rev 248408)
@@ -1667,6 +1667,12 @@
void MediaPlayerPrivateGStreamer::fillTimerFired()
{
+ if (m_errorOccured) {
+ GST_DEBUG_OBJECT(pipeline(), "[Buffering] An error occurred, disabling the fill timer");
+ m_fillTimer.stop();
+ return;
+ }
+
GRefPtr<GstQuery> query = adoptGRef(gst_query_new_buffering(GST_FORMAT_PERCENT));
double fillStatus = 100.0;
GstBufferingMode mode = GST_BUFFERING_DOWNLOAD;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
