<!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>[212571] 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/212571">212571</a></dd>
<dt>Author</dt> <dd>graouts@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-17 13:32:10 -0800 (Fri, 17 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION: Subtitles menu in media controls allows multiple items to be selected
https://bugs.webkit.org/show_bug.cgi?id=168168
<rdar://problem/30488605>
Reviewed by Dean Jackson.
Source/WebCore:
Ensure that only a single audio track and a single text track can be selected
in the tracks panel at any given point.
* Modules/modern-media-controls/media/tracks-support.js:
(TracksSupport.prototype.tracksPanelSelectionDidChange):
(TracksSupport.prototype._sortedTrackList):
(TracksSupport):
LayoutTests:
Enhance the interactive track selection test to select a second track and check
that only a single track is selected at once.
* media/modern-media-controls/tracks-support/tracks-support-click-track-in-panel-expected.txt:
* media/modern-media-controls/tracks-support/tracks-support-click-track-in-panel.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolstrackssupporttrackssupportclicktrackinpanelexpectedtxt">trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-click-track-in-panel-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolstrackssupporttrackssupportclicktrackinpanelhtml">trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-click-track-in-panel.html</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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (212570 => 212571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-17 21:30:15 UTC (rev 212570)
+++ trunk/LayoutTests/ChangeLog 2017-02-17 21:32:10 UTC (rev 212571)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-02-17 Antoine Quint <graouts@apple.com>
+
+ REGRESSION: Subtitles menu in media controls allows multiple items to be selected
+ https://bugs.webkit.org/show_bug.cgi?id=168168
+ <rdar://problem/30488605>
+
+ Reviewed by Dean Jackson.
+
+ Enhance the interactive track selection test to select a second track and check
+ that only a single track is selected at once.
+
+ * media/modern-media-controls/tracks-support/tracks-support-click-track-in-panel-expected.txt:
+ * media/modern-media-controls/tracks-support/tracks-support-click-track-in-panel.html:
+
</ins><span class="cx"> 2017-02-17 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Update TestExpectations for fast/css/appearance-apple-pay-button.html.
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolstrackssupporttrackssupportclicktrackinpanelexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-click-track-in-panel-expected.txt (212570 => 212571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-click-track-in-panel-expected.txt 2017-02-17 21:30:15 UTC (rev 212570)
+++ trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-click-track-in-panel-expected.txt 2017-02-17 21:32:10 UTC (rev 212571)
</span><span class="lines">@@ -3,13 +3,26 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS media.audioTracks[1].enabled is false
</del><ins>+media.audioTracks[0].enabled = true
+media.audioTracks[1].enabled = false
+media.audioTracks[2].enabled = false
</ins><span class="cx">
</span><span class="cx"> Clicking on the tracks button
</span><span class="cx"> Clicking on second audio track in tracks panel
</span><ins>+
</ins><span class="cx"> Obtained change event on media audio tracks
</span><del>-PASS media.audioTracks[1].enabled is true
</del><ins>+media.audioTracks[0].enabled = false
+media.audioTracks[1].enabled = true
+media.audioTracks[2].enabled = false
</ins><span class="cx">
</span><ins>+Clicking on the tracks button
+Clicking on third audio track in tracks panel
+
+Obtained change event on media audio tracks
+media.audioTracks[0].enabled = false
+media.audioTracks[1].enabled = false
+media.audioTracks[2].enabled = true
+
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolstrackssupporttrackssupportclicktrackinpanelhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-click-track-in-panel.html (212570 => 212571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-click-track-in-panel.html 2017-02-17 21:30:15 UTC (rev 212570)
+++ trunk/LayoutTests/media/modern-media-controls/tracks-support/tracks-support-click-track-in-panel.html 2017-02-17 21:32:10 UTC (rev 212571)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <script src="../../../resources/js-test-pre.js"></script>
</span><span class="cx"> <body>
</span><del>-<video src="../../content/CC+Subtitles.mov" style="width: 640px; height: 360px;" controls autoplay></video>
</del><ins>+<video src="../../content/CC+Subtitles.mov" style="position: absolute; left: 0; top: 0; width: 640px; height: 360px;" controls autoplay></video>
</ins><span class="cx"> <script type="text/javascript">
</span><span class="cx">
</span><span class="cx"> window.jsTestIsAsync = true;
</span><span class="lines">@@ -11,33 +11,47 @@
</span><span class="cx"> const media = document.querySelector("video");
</span><span class="cx"> const shadowRoot = window.internals.shadowRoot(media);
</span><span class="cx">
</span><ins>+let previouslySelectedTrack = 0;
+
</ins><span class="cx"> media.addEventListener("play", () => {
</span><span class="cx"> media.pause();
</span><span class="cx">
</span><del>- shouldBeFalse("media.audioTracks[1].enabled");
- debug("");
</del><ins>+ dumpAudioTracksEnabledState();
</ins><span class="cx">
</span><span class="cx"> media.audioTracks.addEventListener("change", audioTracksDidChange);
</span><del>- window.requestAnimationFrame(() => {
- clickOnTracksButton();
- window.requestAnimationFrame(clickOnSecondAudioTrack);
- });
</del><ins>+ clickOnTracksButton(clickOnSecondAudioTrack);
</ins><span class="cx"> });
</span><span class="cx">
</span><del>-function clickOnTracksButton()
</del><ins>+function clickOnTracksButton(continuation)
</ins><span class="cx"> {
</span><del>- debug("Clicking on the tracks button");
- const bounds = shadowRoot.lastChild.querySelector("button.tracks").getBoundingClientRect();
- eventSender.mouseMoveTo(bounds.left + 1, bounds.top + 1);
- eventSender.mouseDown();
- eventSender.mouseUp();
</del><ins>+ window.requestAnimationFrame(() => {
+ debug("");
+ debug("Clicking on the tracks button");
+ clickOnElement(shadowRoot.lastChild.querySelector("button.tracks"));
+ window.requestAnimationFrame(continuation);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function clickOnSecondAudioTrack()
</span><span class="cx"> {
</span><span class="cx"> debug("Clicking on second audio track in tracks panel");
</span><del>- const secondAudioTrack = shadowRoot.lastChild.querySelectorAll("li")[1];
- const bounds = secondAudioTrack.getBoundingClientRect();
</del><ins>+ clickOnAudioTrackAtIndex(1);
+}
+
+function clickOnThirdAudioTrack()
+{
+ debug("Clicking on third audio track in tracks panel");
+ clickOnAudioTrackAtIndex(2);
+}
+
+function clickOnAudioTrackAtIndex(index)
+{
+ clickOnElement(shadowRoot.lastChild.querySelectorAll("li")[index]);
+}
+
+function clickOnElement(element)
+{
+ const bounds = element.getBoundingClientRect();
</ins><span class="cx"> eventSender.mouseMoveTo(bounds.left + 1, bounds.top + 1);
</span><span class="cx"> eventSender.mouseDown();
</span><span class="cx"> eventSender.mouseUp();
</span><span class="lines">@@ -45,14 +59,33 @@
</span><span class="cx">
</span><span class="cx"> function audioTracksDidChange()
</span><span class="cx"> {
</span><ins>+ const newSelectedTrack = Array.from(media.audioTracks).findIndex(track => track.enabled);
+ if (previouslySelectedTrack === newSelectedTrack)
+ return;
+
+ previouslySelectedTrack = newSelectedTrack;
+
+ debug("");
</ins><span class="cx"> debug("Obtained change event on media audio tracks");
</span><del>- shouldBeTrue("media.audioTracks[1].enabled");
</del><span class="cx">
</span><del>- debug("");
- media.remove();
- finishJSTest();
</del><ins>+ dumpAudioTracksEnabledState();
+
+ if (media.audioTracks[1].enabled)
+ shadowRoot.lastChild.addEventListener("transitionend", event => clickOnTracksButton(clickOnThirdAudioTrack));
+ else if (media.audioTracks[2].enabled) {
+ debug("");
+ media.remove();
+ finishJSTest();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+function dumpAudioTracksEnabledState()
+{
+ Array.from(media.audioTracks).forEach((audioTrack, index) => {
+ debug(`media.audioTracks[${index}].enabled = ${media.audioTracks[index].enabled}`);
+ });
+}
+
</ins><span class="cx"> </script>
</span><span class="cx"> <script src="../../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212570 => 212571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-17 21:30:15 UTC (rev 212570)
+++ trunk/Source/WebCore/ChangeLog 2017-02-17 21:32:10 UTC (rev 212571)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-02-17 Antoine Quint <graouts@apple.com>
+
+ REGRESSION: Subtitles menu in media controls allows multiple items to be selected
+ https://bugs.webkit.org/show_bug.cgi?id=168168
+ <rdar://problem/30488605>
+
+ Reviewed by Dean Jackson.
+
+ Ensure that only a single audio track and a single text track can be selected
+ in the tracks panel at any given point.
+
+ * Modules/modern-media-controls/media/tracks-support.js:
+ (TracksSupport.prototype.tracksPanelSelectionDidChange):
+ (TracksSupport.prototype._sortedTrackList):
+ (TracksSupport):
+
</ins><span class="cx"> 2017-02-17 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Invalidate WebAVSampleBufferStatusChangeListener when MediaPlayerPrivateMediaStreamAVFObjC is deallocated.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsmediatrackssupportjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/tracks-support.js (212570 => 212571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/media/tracks-support.js 2017-02-17 21:30:15 UTC (rev 212570)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/tracks-support.js 2017-02-17 21:32:10 UTC (rev 212571)
</span><span class="lines">@@ -105,13 +105,10 @@
</span><span class="cx">
</span><span class="cx"> tracksPanelSelectionDidChange(trackIndex, sectionIndex)
</span><span class="cx"> {
</span><del>- if (sectionIndex == 0 && this._canPickAudioTracks()) {
- let track = this._audioTracks()[trackIndex];
- track.enabled = !track.enabled;
- } else {
- let track = this._textTracks()[trackIndex];
- track.mode = track.mode === "disabled" ? "showing" : "disabled";
- }
</del><ins>+ if (sectionIndex == 0 && this._canPickAudioTracks())
+ this._audioTracks().forEach((audioTrack, index) => audioTrack.enabled = index === trackIndex);
+ else
+ this._textTracks().forEach((textTrack, index) => textTrack.mode = index === trackIndex ? "showing" : "disabled");
</ins><span class="cx">
</span><span class="cx"> this.mediaController.controls.hideTracksPanel();
</span><span class="cx"> }
</span><span class="lines">@@ -147,9 +144,7 @@
</span><span class="cx">
</span><span class="cx"> _sortedTrackList(tracks)
</span><span class="cx"> {
</span><del>- if (this.mediaController.host)
- return this.mediaController.host.sortedTrackListForMenu(tracks);
- return tracks;
</del><ins>+ return Array.from(this.mediaController.host ? this.mediaController.host.sortedTrackListForMenu(tracks) : tracks);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>