<!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>[213987] 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/213987">213987</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-15 10:40:59 -0700 (Wed, 15 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Captions do not default to Auto when language is changed
https://bugs.webkit.org/show_bug.cgi?id=169675
<rdar://problem/30423369>
Patch by Antoine Quint <graouts@apple.com> on 2017-03-15
Reviewed by Eric Carlson.
Source/WebCore:
Ensure we correctly mark the Off and Auto items as selected when we are using the
Off and Auto tracks.
Tests: media/modern-media-controls/tracks-support/tracks-support-auto-text-track.html
media/modern-media-controls/tracks-support/tracks-support-off-text-track.html
* Modules/modern-media-controls/media/tracks-support.js:
(TracksSupport.prototype.tracksPanelIsTrackInSectionSelected):
(TracksSupport.prototype.tracksPanelSelectionDidChange):
LayoutTests:
Add new tests that check the cases where the expected selected track should be "Off" or "Auto".
* media/modern-media-controls/tracks-support/tracks-support-auto-text-track-expected.txt: Added.
* media/modern-media-controls/tracks-support/tracks-support-auto-text-track.html: Added.
* media/modern-media-controls/tracks-support/tracks-support-off-text-track-expected.txt: Added.
* media/modern-media-controls/tracks-support/tracks-support-off-text-track.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="#trunkSourceWebCoreModulesmodernmediacontrolsmediatrackssupportjs">trunk/Source/WebCore/Modules/modern-media-controls/media/tracks-support.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolstrackssupporttrackssupportautotexttrackexpectedtxt">trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-auto-text-track-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolstrackssupporttrackssupportautotexttrackhtml">trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-auto-text-track.html</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolstrackssupporttrackssupportofftexttrackexpectedtxt">trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-off-text-track-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolstrackssupporttrackssupportofftexttrackhtml">trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-off-text-track.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213986 => 213987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-15 17:21:00 UTC (rev 213986)
+++ trunk/LayoutTests/ChangeLog 2017-03-15 17:40:59 UTC (rev 213987)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-03-15 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Captions do not default to Auto when language is changed
+ https://bugs.webkit.org/show_bug.cgi?id=169675
+ <rdar://problem/30423369>
+
+ Reviewed by Eric Carlson.
+
+ Add new tests that check the cases where the expected selected track should be "Off" or "Auto".
+
+ * media/modern-media-controls/tracks-support/tracks-support-auto-text-track-expected.txt: Added.
+ * media/modern-media-controls/tracks-support/tracks-support-auto-text-track.html: Added.
+ * media/modern-media-controls/tracks-support/tracks-support-off-text-track-expected.txt: Added.
+ * media/modern-media-controls/tracks-support/tracks-support-off-text-track.html: Added.
+
</ins><span class="cx"> 2017-03-15 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Mark http/tests/media/modern-media-controls/time-labels-support/long-time.html as flaky on mac-wk1.
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolstrackssupporttrackssupportautotexttrackexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-auto-text-track-expected.txt (0 => 213987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-auto-text-track-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-auto-text-track-expected.txt 2017-03-15 17:40:59 UTC (rev 213987)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+Ensure we have the Auto text track selected by default.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS shadowRoot.querySelector('button.tracks') became different from null
+PASS shadowRoot.querySelector('button.tracks').getBoundingClientRect().width became different from 0
+PASS shadowRoot.querySelector('.tracks-panel') became different from null
+PASS shadowRoot.querySelectorAll('li.selected')[1].textContent is "Auto (Recommended)"
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolstrackssupporttrackssupportautotexttrackhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-auto-text-track.html (0 => 213987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-auto-text-track.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-auto-text-track.html 2017-03-15 17:40:59 UTC (rev 213987)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+<script src="../../../resources/js-test-pre.js"></script>
+<script src="../resources/media-controls-utils.js" type="text/javascript"></script>
+<body>
+<video src="../../content/CC+Subtitles.mov" style="position: absolute; left: 0; top: 0; width: 640px; height: 360px;" controls autoplay></video>
+<script type="text/javascript">
+
+window.jsTestIsAsync = true;
+
+description("Ensure we have the Auto text track selected by default.");
+
+const media = document.querySelector("video");
+const shadowRoot = window.internals.shadowRoot(media);
+
+media.addEventListener("play", () => {
+ media.pause();
+
+ shouldBecomeDifferent("shadowRoot.querySelector('button.tracks')", "null", () => {
+ shouldBecomeDifferent("shadowRoot.querySelector('button.tracks').getBoundingClientRect().width", "0", () => {
+ window.internals.setCaptionDisplayMode("automatic");
+ pressOnElement(shadowRoot.querySelector("button.tracks"));
+ shouldBecomeDifferent("shadowRoot.querySelector('.tracks-panel')", "null", () => {
+ shouldBeEqualToString("shadowRoot.querySelectorAll('li.selected')[1].textContent", "Auto (Recommended)");
+ debug("");
+ window.internals.setCaptionDisplayMode("forcedonly");
+ media.remove();
+ finishJSTest();
+ });
+ });
+ });
+});
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolstrackssupporttrackssupportofftexttrackexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-off-text-track-expected.txt (0 => 213987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-off-text-track-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-off-text-track-expected.txt 2017-03-15 17:40:59 UTC (rev 213987)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+Ensure we have the Off text track selected by default.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS shadowRoot.querySelector('button.tracks') became different from null
+PASS shadowRoot.querySelector('button.tracks').getBoundingClientRect().width became different from 0
+PASS shadowRoot.querySelector('.tracks-panel') became different from null
+PASS shadowRoot.querySelectorAll('li.selected')[1].textContent is "Off"
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolstrackssupporttrackssupportofftexttrackhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-off-text-track.html (0 => 213987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-off-text-track.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-off-text-track.html 2017-03-15 17:40:59 UTC (rev 213987)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<!DOCTYPE html>
+<script src="../../../resources/js-test-pre.js"></script>
+<script src="../resources/media-controls-utils.js" type="text/javascript"></script>
+<body>
+<video src="../../content/CC+Subtitles.mov" style="position: absolute; left: 0; top: 0; width: 640px; height: 360px;" controls autoplay></video>
+<script type="text/javascript">
+
+window.jsTestIsAsync = true;
+
+description("Ensure we have the Off text track selected by default.");
+
+const media = document.querySelector("video");
+const shadowRoot = window.internals.shadowRoot(media);
+
+media.addEventListener("play", () => {
+ media.pause();
+
+ shouldBecomeDifferent("shadowRoot.querySelector('button.tracks')", "null", () => {
+ shouldBecomeDifferent("shadowRoot.querySelector('button.tracks').getBoundingClientRect().width", "0", () => {
+ pressOnElement(shadowRoot.querySelector("button.tracks"));
+ shouldBecomeDifferent("shadowRoot.querySelector('.tracks-panel')", "null", () => {
+ shouldBeEqualToString("shadowRoot.querySelectorAll('li.selected')[1].textContent", "Off");
+ debug("");
+ 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 (213986 => 213987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-15 17:21:00 UTC (rev 213986)
+++ trunk/Source/WebCore/ChangeLog 2017-03-15 17:40:59 UTC (rev 213987)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-03-15 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Captions do not default to Auto when language is changed
+ https://bugs.webkit.org/show_bug.cgi?id=169675
+ <rdar://problem/30423369>
+
+ Reviewed by Eric Carlson.
+
+ Ensure we correctly mark the Off and Auto items as selected when we are using the
+ Off and Auto tracks.
+
+ Tests: media/modern-media-controls/tracks-support/tracks-support-auto-text-track.html
+ media/modern-media-controls/tracks-support/tracks-support-off-text-track.html
+
+ * Modules/modern-media-controls/media/tracks-support.js:
+ (TracksSupport.prototype.tracksPanelIsTrackInSectionSelected):
+ (TracksSupport.prototype.tracksPanelSelectionDidChange):
+
</ins><span class="cx"> 2017-03-15 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r213977.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsmediatrackssupportjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/tracks-support.js (213986 => 213987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/media/tracks-support.js 2017-03-15 17:21:00 UTC (rev 213986)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/tracks-support.js 2017-03-15 17:40:59 UTC (rev 213987)
</span><span class="lines">@@ -100,7 +100,16 @@
</span><span class="cx"> {
</span><span class="cx"> if (sectionIndex == 0 && this._canPickAudioTracks())
</span><span class="cx"> return this._audioTracks()[trackIndex].enabled;
</span><del>- return this._textTracks()[trackIndex].mode !== "disabled";
</del><ins>+
+ const trackItem = this._textTracks()[trackIndex];
+ const host = this.mediaController.host;
+ const usesAutomaticTrack = host ? host.captionDisplayMode === "automatic" : false;
+
+ if (host && trackItem === host.captionMenuOffItem && (host.captionDisplayMode === "forced-only" || host.captionDisplayMode === "manual"))
+ return true;
+ if (host && trackItem === host.captionMenuAutomaticItem && usesAutomaticTrack)
+ return true;
+ return !usesAutomaticTrack && trackItem.mode !== "disabled";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> tracksPanelSelectionDidChange(trackIndex, sectionIndex)
</span><span class="lines">@@ -107,6 +116,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (sectionIndex == 0 && this._canPickAudioTracks())
</span><span class="cx"> this._audioTracks().forEach((audioTrack, index) => audioTrack.enabled = index === trackIndex);
</span><ins>+ else if (this.mediaController.host)
+ this.mediaController.host.setSelectedTextTrack(this._textTracks()[trackIndex]);
</ins><span class="cx"> else
</span><span class="cx"> this._textTracks().forEach((textTrack, index) => textTrack.mode = index === trackIndex ? "showing" : "disabled");
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>