<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[159810] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/159810">159810</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2013-11-27 02:47:56 -0800 (Wed, 27 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GStreamer] Invalid command line error when visiting www.chessbase.com
https://bugs.webkit.org/show_bug.cgi?id=124715

Reviewed by Philippe Normand.

Source/WebCore:

We were not handling the HTTP errors in the WebKit GStreamer
source and therefore the 404 error page was being 'decoded'. As no
decoder could be found (for obvious reasons), playback failed, but
it should be failing for the source not being found instead of the
decoding problem.

Test: http/tests/media/video-error-does-not-exist.html

* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(StreamingClient::handleResponseReceived): Handle HTTP errors in
the source and raise a GStreamer error to the pipeline.

LayoutTests:

Copied and adapted for HTTP from
media/video-error-does-not-exist.html.

* http/tests/media/video-error-does-not-exist-expected.txt: Added.
* http/tests/media/video-error-does-not-exist.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsmediavideoerrordoesnotexistexpectedtxt">trunk/LayoutTests/http/tests/media/video-error-does-not-exist-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsmediavideoerrordoesnotexisthtml">trunk/LayoutTests/http/tests/media/video-error-does-not-exist.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (159809 => 159810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2013-11-27 08:43:07 UTC (rev 159809)
+++ trunk/LayoutTests/ChangeLog        2013-11-27 10:47:56 UTC (rev 159810)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2013-11-27  Xabier Rodriguez Calvar  &lt;calvaris@igalia.com&gt;
+
+        [GStreamer] Invalid command line error when visiting www.chessbase.com
+        https://bugs.webkit.org/show_bug.cgi?id=124715
+
+        Reviewed by Philippe Normand.
+
+        Copied and adapted for HTTP from
+        media/video-error-does-not-exist.html.
+
+        * http/tests/media/video-error-does-not-exist-expected.txt: Added.
+        * http/tests/media/video-error-does-not-exist.html: Added.
+
</ins><span class="cx"> 2013-11-14  Sergio Villar Senin  &lt;svillar@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [CSS Grid Layout] Fix positioning of grid items with margins
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmediavideoerrordoesnotexistexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/media/video-error-does-not-exist-expected.txt (0 => 159810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/video-error-does-not-exist-expected.txt                                (rev 0)
+++ trunk/LayoutTests/http/tests/media/video-error-does-not-exist-expected.txt        2013-11-27 10:47:56 UTC (rev 159810)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+Test that the media element is in correct state after load fails from HTTP.
+
+
+
+EXPECTED (video.error == 'null') OK
+
+EVENT(error)
+EXPECTED (video.error != 'null') OK
+EXPECTED (video.error.code == '4') OK
+EXPECTED (video.networkState == '3') OK
+EXPECTED (isNaN(video.duration) == 'true') OK
+EXPECTED (video.currentTime == '0') OK
+EXPECTED (video.buffered.length == '0') OK
+EXPECTED (video.seekable.length == '0') OK
+EXPECTED (video.buffered.length == '0') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsmediavideoerrordoesnotexisthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/media/video-error-does-not-exist.html (0 => 159810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/video-error-does-not-exist.html                                (rev 0)
+++ trunk/LayoutTests/http/tests/media/video-error-does-not-exist.html        2013-11-27 10:47:56 UTC (rev 159810)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+&lt;p&gt;Test that the media element is in correct state after load fails from HTTP.&lt;/p&gt;
+&lt;video controls&gt;&lt;/video&gt;
+&lt;script src=../../media-resources/video-test.js&gt;&lt;/script&gt;
+&lt;script src=../../media-resources/media-file.js&gt;&lt;/script&gt;
+&lt;script&gt;
+
+    consoleWrite(&quot;&quot;);
+    testExpected(&quot;video.error&quot;, null);
+
+    waitForEventAndTest(&quot;canplaythrough&quot;, &quot;false&quot;);
+    
+    waitForEvent(&quot;error&quot;, function () {
+        testExpected(&quot;video.error&quot;, null, &quot;!=&quot;);
+        testExpected(&quot;video.error.code&quot;, MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED);
+    
+        testExpected(&quot;video.networkState&quot;, HTMLMediaElement.NETWORK_NO_SOURCE);
+    
+        testExpected(&quot;isNaN(video.duration)&quot;, true);
+        testExpected(&quot;video.currentTime&quot;, 0);
+        testExpected(&quot;video.buffered.length&quot;, 0);
+        testExpected(&quot;video.seekable.length&quot;, 0);
+        testExpected(&quot;video.buffered.length&quot;, 0);
+        endTest();
+    });
+    
+    video.src = &quot;http://127.0.0.1:8000/does-not-exist.mpeg&quot;;
+    consoleWrite(&quot;&quot;);
+&lt;/script&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (159809 => 159810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-11-27 08:43:07 UTC (rev 159809)
+++ trunk/Source/WebCore/ChangeLog        2013-11-27 10:47:56 UTC (rev 159810)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2013-11-27  Xabier Rodriguez Calvar  &lt;calvaris@igalia.com&gt;
+
+        [GStreamer] Invalid command line error when visiting www.chessbase.com
+        https://bugs.webkit.org/show_bug.cgi?id=124715
+
+        Reviewed by Philippe Normand.
+
+        We were not handling the HTTP errors in the WebKit GStreamer
+        source and therefore the 404 error page was being 'decoded'. As no
+        decoder could be found (for obvious reasons), playback failed, but
+        it should be failing for the source not being found instead of the
+        decoding problem.
+
+        Test: http/tests/media/video-error-does-not-exist.html
+
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (StreamingClient::handleResponseReceived): Handle HTTP errors in
+        the source and raise a GStreamer error to the pipeline.
+
</ins><span class="cx"> 2013-11-14  Sergio Villar Senin  &lt;svillar@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [CSS Grid Layout] Fix positioning of grid items with margins
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (159809 => 159810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp        2013-11-27 08:43:07 UTC (rev 159809)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp        2013-11-27 10:47:56 UTC (rev 159810)
</span><span class="lines">@@ -837,6 +837,14 @@
</span><span class="cx"> 
</span><span class="cx">     GST_DEBUG_OBJECT(src, &quot;Received response: %d&quot;, response.httpStatusCode());
</span><span class="cx"> 
</span><ins>+    if (response.httpStatusCode() &gt;= 400) {
+        // Received error code
+        GST_ELEMENT_ERROR(src, RESOURCE, READ, (&quot;Received %d HTTP error code&quot;, response.httpStatusCode()), (0));
+        gst_app_src_end_of_stream(priv-&gt;appsrc);
+        webKitWebSrcStop(src);
+        return;
+    }
+
</ins><span class="cx">     GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</span><span class="cx"> 
</span><span class="cx">     if (priv-&gt;seekID) {
</span></span></pre>
</div>
</div>

</body>
</html>