<!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>[167828] 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/167828">167828</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-04-25 15:18:23 -0700 (Fri, 25 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support "Live" streams in media controls.
https://bugs.webkit.org/show_bug.cgi?id=131390
Reviewed by Brent Fulgham.
Source/WebCore:
Test: http/tests/media/hls/video-controls-live-stream.html
Support "Live" streams by adding an isLive property to our media controls.
* Modules/mediacontrols/mediaControlsApple.css:
(audio::-webkit-media-controls-status-display):
(video:-webkit-full-screen::-webkit-media-controls-status-display):
* Modules/mediacontrols/mediaControlsApple.js:
(Controller): isLive defaults to false.
(Controller.prototype.setIsLive): Set the isLive property and conditionally reconfigure the controls.
(Controller.prototype.configureInlineControls): Don't add the timeline if we are live.
(Controller.prototype.configureFullScreenControls): Ditto.
(Controller.prototype.updateStatusDisplay): Added.
(Controller.prototype.handleLoadStart): Call updateStatusDisplay().
(Controller.prototype.handleError): Ditto.
(Controller.prototype.handleAbort): Ditto.
(Controller.prototype.handleSuspend): Ditto.
(Controller.prototype.handleStalled): Ditto.
(Controller.prototype.handleWaiting): Ditto.
(Controller.prototype.updateDuration): Ditto.
(Controller.prototype.updateReadyState): Ditto.
LayoutTests:
* http/tests/media/hls/video-controls-live-stream-expected.txt: Added.
* http/tests/media/hls/video-controls-live-stream.html: Added.
* http/tests/media/resources/hls/test-live.php: Added.
* http/tests/media/resources/hls/test-vod.m3u8: Added.
* http/tests/media/resources/hls/test.ts: Added.
* platform/efl/TestExpectations:
* platform/gtk/TestExpectations:
* platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt:
* platform/mac/fast/layers/video-layer-expected.txt:
* platform/mac/media/media-controls-clone-expected.txt:
* platform/wincairo/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformeflTestExpectations">trunk/LayoutTests/platform/efl/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasthidpivideocontrolsinhidpiexpectedtxt">trunk/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastlayersvideolayerexpectedtxt">trunk/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediamediacontrolscloneexpectedtxt">trunk/LayoutTests/platform/mac/media/media-controls-clone-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformwincairoTestExpectations">trunk/LayoutTests/platform/wincairo/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplecss">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/http/tests/media/hls/</li>
<li><a href="#trunkLayoutTestshttptestsmediahlsvideocontrolslivestreamexpectedtxt">trunk/LayoutTests/http/tests/media/hls/video-controls-live-stream-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsmediahlsvideocontrolslivestreamhtml">trunk/LayoutTests/http/tests/media/hls/video-controls-live-stream.html</a></li>
<li><a href="#trunkLayoutTestshttptestsmediaresourceshlstestlivephp">trunk/LayoutTests/http/tests/media/resources/hls/test-live.php</a></li>
<li><a href="#trunkLayoutTestshttptestsmediaresourceshlstestvodm3u8">trunk/LayoutTests/http/tests/media/resources/hls/test-vod.m3u8</a></li>
<li><a href="#trunkLayoutTestshttptestsmediaresourceshlstestts">trunk/LayoutTests/http/tests/media/resources/hls/test.ts</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167827 => 167828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-04-25 22:02:49 UTC (rev 167827)
+++ trunk/LayoutTests/ChangeLog        2014-04-25 22:18:23 UTC (rev 167828)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-04-11 Jer Noble <jer.noble@apple.com>
+
+ Support "Live" streams in media controls.
+ https://bugs.webkit.org/show_bug.cgi?id=131390
+
+ Reviewed by Brent Fulgham.
+
+ * http/tests/media/hls/video-controls-live-stream-expected.txt: Added.
+ * http/tests/media/hls/video-controls-live-stream.html: Added.
+ * http/tests/media/resources/hls/test-live.php: Added.
+ * http/tests/media/resources/hls/test-vod.m3u8: Added.
+ * http/tests/media/resources/hls/test.ts: Added.
+ * platform/efl/TestExpectations:
+ * platform/gtk/TestExpectations:
+ * platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt:
+ * platform/mac/fast/layers/video-layer-expected.txt:
+ * platform/mac/media/media-controls-clone-expected.txt:
+ * platform/wincairo/TestExpectations:
+
</ins><span class="cx"> 2014-04-25 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r167818): editing/inserting/typing-space-to-trigger-smart-link.html fails on WebKit1 bots
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmediahlsvideocontrolslivestreamexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/media/hls/video-controls-live-stream-expected.txt (0 => 167828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/hls/video-controls-live-stream-expected.txt         (rev 0)
+++ trunk/LayoutTests/http/tests/media/hls/video-controls-live-stream-expected.txt        2014-04-25 22:18:23 UTC (rev 167828)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+
+EVENT(play)
+EXPECTED (video.duration == 'Infinity') OK
+EXPECTED (mediaControlsElement(controls, "-webkit-media-controls-rewind-button") == 'null') OK
+EXPECTED (mediaControlsElement(controls, "-webkit-media-controls-play-button") != 'null') OK
+EXPECTED (mediaControlsElement(controls, "-webkit-media-controls-status-display") != 'null') OK
+EXPECTED (mediaControlsElement(controls, "-webkit-media-controls-timeline") == 'null') OK
+EXPECTED (mediaControlsElement(controls, "-webkit-media-controls-current-time-display") == 'null') OK
+EXPECTED (mediaControlsElement(controls, "-webkit-media-controls-remaining-time-display") == 'null') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsmediahlsvideocontrolslivestreamhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/media/hls/video-controls-live-stream.html (0 => 167828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/hls/video-controls-live-stream.html         (rev 0)
+++ trunk/LayoutTests/http/tests/media/hls/video-controls-live-stream.html        2014-04-25 22:18:23 UTC (rev 167828)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script src=../../media-resources/video-test.js></script>
+ <script src=../../media-resources/media-controls.js></script>
+ <script>
+ var controls;
+
+ function start() {
+ video = document.getElementById('video');
+ waitForEvent('play', playing);
+ waitForEventAndFail('stalled');
+ video.src = "../resources/hls/test-live.php";
+ }
+
+ function playing() {
+ testExpected('video.duration', Infinity);
+
+ controls = internals.shadowRoot(video).firstChild.firstChild;
+ testExpected('mediaControlsElement(controls, "-webkit-media-controls-rewind-button")', null);
+ testExpected('mediaControlsElement(controls, "-webkit-media-controls-play-button")', null, '!=');
+ testExpected('mediaControlsElement(controls, "-webkit-media-controls-status-display")', null, '!=');
+ testExpected('mediaControlsElement(controls, "-webkit-media-controls-timeline")', null);
+ testExpected('mediaControlsElement(controls, "-webkit-media-controls-current-time-display")', null);
+ testExpected('mediaControlsElement(controls, "-webkit-media-controls-remaining-time-display")', null);
+ endTest();
+ }
+
+ </script>
+ </head>
+ <body onload="start()">
+ <video id="video" autoplay controls></video>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsmediaresourceshlstestlivephp"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/media/resources/hls/test-live.php (0 => 167828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/resources/hls/test-live.php         (rev 0)
+++ trunk/LayoutTests/http/tests/media/resources/hls/test-live.php        2014-04-25 22:18:23 UTC (rev 167828)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<?php
+# See the HLS ITEF spec: <http://tools.ietf.org/id/draft-pantos-http-live-streaming-12.txt>
+header("Status: 200 OK");
+header("HTTP/1.1 200 OK");
+header("Connection: close");
+header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+header("Pragma: no-cache");
+header("Etag: " . '"' . filesize(__FILE__) . "-" . filemtime(__FILE__) . '"');
+header("Content-Type: application/x-mpegurl");
+header("Content-Length: " . filesize(__FILE__));
+
+$chunkDuration = 6.0272;
+$chunkCount = 4;
+
+function println($string) { return print($string . PHP_EOL); }
+println("#EXTM3U");
+println("#EXT-X-TARGETDURATION:7");
+println("#EXT-X-VERSION:4");
+println("#EXT-X-MEDIA-SEQUENCE:" . (time() / $chunkDuration % 100));
+
+$time = time();
+$time = $time - $time % $chunkDuration;
+
+for ($i = 0; $i < $chunkCount; ++$i) {
+        $time += 6;
+        println("#EXT-X-PROGRAM-DATE-TIME:" . gmdate("c", $time));
+        println("#EXTINF:" . $chunkDuration . ",");
+        println("test.ts");
+}
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsmediaresourceshlstestvodm3u8"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/media/resources/hls/test-vod.m3u8 (0 => 167828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/resources/hls/test-vod.m3u8         (rev 0)
+++ trunk/LayoutTests/http/tests/media/resources/hls/test-vod.m3u8        2014-04-25 22:18:23 UTC (rev 167828)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+#EXTM3U
+#EXT-X-TARGETDURATION:6
+#EXT-X-VERSION:4
+#EXT-X-MEDIA-SEQUENCE:0
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXTINF:6.0272,
+test.ts
+#EXT-X-ENDLIST
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsmediaresourceshlstestts"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/media/resources/hls/test.ts (0 => 167828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/resources/hls/test.ts         (rev 0)
+++ trunk/LayoutTests/http/tests/media/resources/hls/test.ts        2014-04-25 22:18:23 UTC (rev 167828)
</span><span class="lines">@@ -0,0 +1,2127 @@
</span><ins>+G@ \xB0
+ \xC1 \xE1 \xE8\xF9^}\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFFGA \xB0 \xC1 \xE1\xF0 \xE1\xF0 \xE1\xF0 $\xE1\xFD\xD0\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFFGA0 \xDA\xC5\xFE\x8A \xE0 \x84\xC0
+1 7\x8E\x99 7wA         \xF0 'M@
+\xA9(>`
+A\x80A\xAD\xB0\xAD{\xDF (\xDE        \x88 \x82\xAE\xA5\x80 @\x80 \x87\xF4N\xCD
+Kܡ\x94:\xC3ԛ \x80 %\xB8 !\xFB\xFFa\xEE( \xA2\xC0p D \x80 R ),\x80 \x82