<!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>[211641] 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/211641">211641</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-03 11:53:37 -0800 (Fri, 03 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Skip back button is visible with a live broadcast video
https://bugs.webkit.org/show_bug.cgi?id=167793
Patch by Antoine Quint <graouts@apple.com> on 2017-02-03
Reviewed by Eric Carlson.
Source/WebCore:
We shouldn't be showing the skip back button when a live broadcast video is playing.
We now listen to the "durationchange" event to determine when we have an inifinite-duration
video and disable the skip button in that case.
Test: http/tests/media/modern-media-controls/skip-back-support/skip-back-support-live-broadcast.html
* Modules/modern-media-controls/media/skip-back-support.js:
(SkipBackSupport.prototype.get mediaEvents):
(SkipBackSupport.prototype.syncControl):
(SkipBackSupport):
LayoutTests:
Add a new test to check that a live broadcast video doesn't show the skip back button.
* http/tests/media/modern-media-controls/skip-back-support/skip-back-support-live-broadcast-expected.txt: Added.
* http/tests/media/modern-media-controls/skip-back-support/skip-back-support-live-broadcast.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="#trunkSourceWebCoreModulesmodernmediacontrolsmediaskipbacksupportjs">trunk/Source/WebCore/Modules/modern-media-controls/media/skip-back-support.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsmediamodernmediacontrolsskipbacksupportskipbacksupportlivebroadcastexpectedtxt">trunk/LayoutTests/http/tests/media/modern-media-controls/skip-back-support/skip-back-support-live-broadcast-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsmediamodernmediacontrolsskipbacksupportskipbacksupportlivebroadcasthtml">trunk/LayoutTests/http/tests/media/modern-media-controls/skip-back-support/skip-back-support-live-broadcast.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211640 => 211641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-03 19:08:07 UTC (rev 211640)
+++ trunk/LayoutTests/ChangeLog 2017-02-03 19:53:37 UTC (rev 211641)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-02-03 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Skip back button is visible with a live broadcast video
+ https://bugs.webkit.org/show_bug.cgi?id=167793
+
+ Reviewed by Eric Carlson.
+
+ Add a new test to check that a live broadcast video doesn't show the skip back button.
+
+ * http/tests/media/modern-media-controls/skip-back-support/skip-back-support-live-broadcast-expected.txt: Added.
+ * http/tests/media/modern-media-controls/skip-back-support/skip-back-support-live-broadcast.html: Added.
+
</ins><span class="cx"> 2017-02-03 Per Arne Vollan <pvollan@apple.com>
</span><span class="cx">
</span><span class="cx"> The CSS property -webkit-text-stroke is not applied on captions.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmediamodernmediacontrolsskipbacksupportskipbacksupportlivebroadcastexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/media/modern-media-controls/skip-back-support/skip-back-support-live-broadcast-expected.txt (0 => 211641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/modern-media-controls/skip-back-support/skip-back-support-live-broadcast-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/media/modern-media-controls/skip-back-support/skip-back-support-live-broadcast-expected.txt 2017-02-03 19:53:37 UTC (rev 211641)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Testing the SkipBackSupport behavior with live broadcast.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS media.duration is Number.POSITIVE_INFINITY
+PASS mediaController.controls.skipBackButton.enabled is false
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsmediamodernmediacontrolsskipbacksupportskipbacksupportlivebroadcasthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/media/modern-media-controls/skip-back-support/skip-back-support-live-broadcast.html (0 => 211641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/modern-media-controls/skip-back-support/skip-back-support-live-broadcast.html (rev 0)
+++ trunk/LayoutTests/http/tests/media/modern-media-controls/skip-back-support/skip-back-support-live-broadcast.html 2017-02-03 19:53:37 UTC (rev 211641)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<script src="../../../../../resources/js-test-pre.js"></script>
+<script src="/media-resources/modern-media-controls/resources/media-controls-loader.js"></script>
+<body>
+<video src="../../resources/hls/test-live.php" style="width: 800px;" autoplay></video>
+<div id="shadow"></div>
+<script type="text/javascript">
+
+window.jsTestIsAsync = true;
+
+description("Testing the <code>SkipBackSupport</code> behavior with live broadcast.");
+
+const shadowRoot = document.querySelector("div#shadow").attachShadow({ mode: "open" });
+const media = document.querySelector("video");
+const mediaController = createControls(shadowRoot, media, null);
+
+media.addEventListener("durationchange", event => {
+ shouldBe("media.duration", "Number.POSITIVE_INFINITY");
+ shouldBeFalse("mediaController.controls.skipBackButton.enabled");
+
+ debug("");
+ shadowRoot.host.remove();
+ media.remove();
+ finishJSTest();
+});
+
+</script>
+<script src="../../../../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211640 => 211641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-03 19:08:07 UTC (rev 211640)
+++ trunk/Source/WebCore/ChangeLog 2017-02-03 19:53:37 UTC (rev 211641)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-02-03 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Skip back button is visible with a live broadcast video
+ https://bugs.webkit.org/show_bug.cgi?id=167793
+
+ Reviewed by Eric Carlson.
+
+ We shouldn't be showing the skip back button when a live broadcast video is playing.
+ We now listen to the "durationchange" event to determine when we have an inifinite-duration
+ video and disable the skip button in that case.
+
+ Test: http/tests/media/modern-media-controls/skip-back-support/skip-back-support-live-broadcast.html
+
+ * Modules/modern-media-controls/media/skip-back-support.js:
+ (SkipBackSupport.prototype.get mediaEvents):
+ (SkipBackSupport.prototype.syncControl):
+ (SkipBackSupport):
+
</ins><span class="cx"> 2017-02-03 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> URLParser: implement forbidden host code points for non-special URLs
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsmediaskipbacksupportjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/skip-back-support.js (211640 => 211641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/media/skip-back-support.js 2017-02-03 19:08:07 UTC (rev 211640)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/skip-back-support.js 2017-02-03 19:53:37 UTC (rev 211641)
</span><span class="lines">@@ -35,6 +35,11 @@
</span><span class="cx"> return this.mediaController.controls.skipBackButton;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get mediaEvents()
+ {
+ return ["durationchange"];
+ }
+
</ins><span class="cx"> buttonWasPressed(control)
</span><span class="cx"> {
</span><span class="cx"> const media = this.mediaController.media;
</span><span class="lines">@@ -41,4 +46,9 @@
</span><span class="cx"> media.currentTime = Math.max(media.currentTime - SkipBackSeconds, media.seekable.start(0));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ syncControl()
+ {
+ this.control.enabled = this.mediaController.media.duration !== Number.POSITIVE_INFINITY;
+ }
+
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>