Changeset 219202 in webkit


Ignore:
Timestamp:
Jul 6, 2017 10:12:54 AM (7 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r219194.
​https://bugs.webkit.org/show_bug.cgi?id=174207

it broke some layout tests (Requested by clopez on #webkit).

Reverted changeset:

"[GStreamer] vid.me videos do not play"
​https://bugs.webkit.org/show_bug.cgi?id=172240
​http://trac.webkit.org/changeset/219194

Location:
trunk
Files:
4 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r219194 r219202  
     12017-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
    1142017-07-06  Charlie Turner  <cturner@igalia.com>
    215

  • trunk/Source/WebCore/ChangeLog

    r219201 r219202  
     12017-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
    1142017-07-06  David Kilzer  <ddkilzer@apple.com>
    215

  • trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp

    r219194 r219202  
    211211}
    212212
    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 
    229213void MediaPlayerPrivateGStreamer::load(const String& urlString)
    230214{
    … …  
    236220        return;
    237221
     222    // Clean out everything after file:// url path.
     223    String cleanURL(urlString);
     224    if (url.isLocalFile())
     225        cleanURL = cleanURL.substring(0, url.pathEnd());
     226
    238227    if (!m_pipeline)
    239228        createGSTPlayBin();
    … …  
    244233    ASSERT(m_pipeline);
    245234
    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());
    247239
    248240    if (m_preload == MediaPlayer::None) {
    … …  
    16881680            if (state <= GST_STATE_READY) {
    16891681                // 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;
    16911684                changePipelineState(GST_STATE_PLAYING);
    16921685                return true;

  • trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h

    r219194 r219202  
    174174    static void downloadBufferFileCreatedCallback(MediaPlayerPrivateGStreamer*);
    175175
    176     void setPlaybinURL(const URL& urlString);
    177 
    178176protected:
    179177    void cacheDuration();

  • trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp

    r219194 r219202  
    728728const gchar* const* webKitWebSrcGetProtocols(GType)
    729729{
    730     static const char* protocols[] = {"webkit+http", "webkit+https", "blob", nullptr };
     730    static const char* protocols[] = {"http", "https", "blob", nullptr };
    731731    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;
    740732}
    741733
    … …  
    767759        return TRUE;
    768760
    769     URL url = convertPlaybinURI(uri);
     761    URL url(URL(), uri);
    770762    if (!urlHasSupportedProtocol(url)) {
    771763        g_set_error(error, GST_URI_ERROR, GST_URI_ERROR_BAD_URI, "Invalid URI '%s'", uri);

  • trunk/Tools/ChangeLog

    r219199 r219202  
     12017-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
    1142017-07-06  Matt Lewis  <jlewis3@apple.com>
    215

  • trunk/Tools/gtk/jhbuild.modules

    r219194 r219202  
    218218
    219219  <autotools id="libsoup"
    220              autogenargs="--disable-introspection">
     220             autogenargs="--without-gnome --disable-introspection">
    221221    <if condition-set="macos">
    222222      <autogenargs value="--disable-tls-check"/>
    … …  
    339339  </autotools>
    340340
    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">
    342342    <if condition-set="macos">
    343343      <autogenargs value="--disable-introspection"/>
Note: See TracChangeset for help on using the changeset viewer.