Merge r228944 - [GStreamer] media/video-src-blob-using-open-panel.htm…

…l crashes in Debug https://bugs.webkit.org/show_bug.cgi?id=183005 Reviewed by Xabier Rodriguez-Calvar. Test: media/video-src-blob-using-open-panel.html * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp: (WebCore::convertToInternalProtocol): Also convert blob URIs because they're handled by our httpsrc element. * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp: (webKitWebSrcGetProtocols): Prefix blob URIs too, for consistency purpose.
WebKit · Mar 5, 2018 · 8ddb40f · 8ddb40f
1 parent ddd96a5
commit 8ddb40f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2018-02-23  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] media/video-src-blob-using-open-panel.html crashes in Debug
+        https://bugs.webkit.org/show_bug.cgi?id=183005
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        Test: media/video-src-blob-using-open-panel.html
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::convertToInternalProtocol): Also convert blob URIs
+        because they're handled by our httpsrc element.
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (webKitWebSrcGetProtocols): Prefix blob URIs too, for consistency purpose.
+
 2018-02-22  Yusuke Suzuki  <utatane.tea@gmail.com>
 
         Remove currentTime() / currentTimeMS()

diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -216,7 +216,7 @@ MediaPlayerPrivateGStreamer::~MediaPlayerPrivateGStreamer()
 
 static void convertToInternalProtocol(URL& url)
 {
-    if (url.protocolIsInHTTPFamily())
+    if (url.protocolIsInHTTPFamily() || url.protocolIsBlob())
         url.setProtocol("webkit+" + url.protocol());
 }
 

diff --git a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
@@ -618,7 +618,7 @@ static GstURIType webKitWebSrcUriGetType(GType)
 
 const gchar* const* webKitWebSrcGetProtocols(GType)
 {
-    static const char* protocols[] = {"webkit+http", "webkit+https", "blob", nullptr };
+    static const char* protocols[] = {"webkit+http", "webkit+https", "webkit+blob", nullptr };
     return protocols;
 }