Changeset 219202 in webkit
- Timestamp:
- Jul 6, 2017 10:12:54 AM (7 years ago)
- Location:
- trunk
- Files:
-
- 4 deleted
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r219194 r219202 1 2017-07-06 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, rolling out r219194. 4 https://bugs.webkit.org/show_bug.cgi?id=174207 5 6 it broke some layout tests (Requested by clopez on #webkit). 7 8 Reverted changeset: 9 10 "[GStreamer] vid.me videos do not play" 11 https://bugs.webkit.org/show_bug.cgi?id=172240 12 http://trac.webkit.org/changeset/219194 13 1 14 2017-07-06 Charlie Turner <cturner@igalia.com> 2 15 -
trunk/Source/WebCore/ChangeLog
r219201 r219202 1 2017-07-06 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, rolling out r219194. 4 https://bugs.webkit.org/show_bug.cgi?id=174207 5 6 it broke some layout tests (Requested by clopez on #webkit). 7 8 Reverted changeset: 9 10 "[GStreamer] vid.me videos do not play" 11 https://bugs.webkit.org/show_bug.cgi?id=172240 12 http://trac.webkit.org/changeset/219194 13 1 14 2017-07-06 David Kilzer <ddkilzer@apple.com> 2 15 -
trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
r219194 r219202 211 211 } 212 212 213 void MediaPlayerPrivateGStreamer::setPlaybinURL(const URL& url)214 {215 // Clean out everything after file:// url path.216 String cleanURLString(url.string());217 if (url.isLocalFile())218 cleanURLString = cleanURLString.substring(0, url.pathEnd());219 220 m_url = URL(URL(), cleanURLString);221 222 if (m_url.protocolIsInHTTPFamily())223 m_url.setProtocol("webkit+" + url.protocol());224 225 GST_INFO("Load %s", cleanURLString.utf8().data());226 g_object_set(m_pipeline.get(), "uri", cleanURLString.utf8().data(), nullptr);227 }228 229 213 void MediaPlayerPrivateGStreamer::load(const String& urlString) 230 214 { … … 236 220 return; 237 221 222 // Clean out everything after file:// url path. 223 String cleanURL(urlString); 224 if (url.isLocalFile()) 225 cleanURL = cleanURL.substring(0, url.pathEnd()); 226 238 227 if (!m_pipeline) 239 228 createGSTPlayBin(); … … 244 233 ASSERT(m_pipeline); 245 234 246 setPlaybinURL(url); 235 m_url = URL(URL(), cleanURL); 236 g_object_set(m_pipeline.get(), "uri", cleanURL.utf8().data(), nullptr); 237 238 GST_INFO("Load %s", cleanURL.utf8().data()); 247 239 248 240 if (m_preload == MediaPlayer::None) { … … 1688 1680 if (state <= GST_STATE_READY) { 1689 1681 // Set the new uri and start playing. 1690 setPlaybinURL(newUrl); 1682 g_object_set(m_pipeline.get(), "uri", newUrl.string().utf8().data(), nullptr); 1683 m_url = newUrl; 1691 1684 changePipelineState(GST_STATE_PLAYING); 1692 1685 return true; -
trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
r219194 r219202 174 174 static void downloadBufferFileCreatedCallback(MediaPlayerPrivateGStreamer*); 175 175 176 void setPlaybinURL(const URL& urlString);177 178 176 protected: 179 177 void cacheDuration(); -
trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
r219194 r219202 728 728 const gchar* const* webKitWebSrcGetProtocols(GType) 729 729 { 730 static const char* protocols[] = {" webkit+http", "webkit+https", "blob", nullptr };730 static const char* protocols[] = {"http", "https", "blob", nullptr }; 731 731 return protocols; 732 }733 734 static URL convertPlaybinURI(const char* uriString)735 {736 URL url(URL(), uriString);737 ASSERT(url.protocol().substring(0, 7) == "webkit+");738 url.setProtocol(url.protocol().substring(7).toString());739 return url;740 732 } 741 733 … … 767 759 return TRUE; 768 760 769 URL url = convertPlaybinURI(uri);761 URL url(URL(), uri); 770 762 if (!urlHasSupportedProtocol(url)) { 771 763 g_set_error(error, GST_URI_ERROR, GST_URI_ERROR_BAD_URI, "Invalid URI '%s'", uri); -
trunk/Tools/ChangeLog
r219199 r219202 1 2017-07-06 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, rolling out r219194. 4 https://bugs.webkit.org/show_bug.cgi?id=174207 5 6 it broke some layout tests (Requested by clopez on #webkit). 7 8 Reverted changeset: 9 10 "[GStreamer] vid.me videos do not play" 11 https://bugs.webkit.org/show_bug.cgi?id=172240 12 http://trac.webkit.org/changeset/219194 13 1 14 2017-07-06 Matt Lewis <jlewis3@apple.com> 2 15 -
trunk/Tools/gtk/jhbuild.modules
r219194 r219202 218 218 219 219 <autotools id="libsoup" 220 autogenargs="-- disable-introspection">220 autogenargs="--without-gnome --disable-introspection"> 221 221 <if condition-set="macos"> 222 222 <autogenargs value="--disable-tls-check"/> … … 339 339 </autotools> 340 340 341 <autotools id="gst-plugins-good" autogen-sh="configure" autogenargs="--disable-examples --disable- gtk-doc">341 <autotools id="gst-plugins-good" autogen-sh="configure" autogenargs="--disable-examples --disable-soup --disable-gtk-doc"> 342 342 <if condition-set="macos"> 343 343 <autogenargs value="--disable-introspection"/>
Note: See TracChangeset
for help on using the changeset viewer.