<!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>[213254] trunk/LayoutTests</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/213254">213254</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-01 18:07:41 -0800 (Wed, 01 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unskip media/modern-media-controls/audio/audio-controls-buttons.html
https://bugs.webkit.org/show_bug.cgi?id=165234
<rdar://problem/30282714>
Patch by Antoine Quint <graouts@apple.com> on 2017-03-01
Reviewed by Jon Lee.
Update this test to follow the same pattern used in media/modern-media-controls/airplay-support/airplay-support.html
which has proven to be robust.
* media/modern-media-controls/audio/audio-controls-buttons-expected.txt:
* media/modern-media-controls/audio/audio-controls-buttons.html:
* platform/mac/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsaudioaudiocontrolsbuttonsexpectedtxt">trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-buttons-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsaudioaudiocontrolsbuttonshtml">trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-buttons.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213253 => 213254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-02 00:28:27 UTC (rev 213253)
+++ trunk/LayoutTests/ChangeLog 2017-03-02 02:07:41 UTC (rev 213254)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-03-01 Antoine Quint <graouts@apple.com>
+
+ Unskip media/modern-media-controls/audio/audio-controls-buttons.html
+ https://bugs.webkit.org/show_bug.cgi?id=165234
+ <rdar://problem/30282714>
+
+ Reviewed by Jon Lee.
+
+ Update this test to follow the same pattern used in media/modern-media-controls/airplay-support/airplay-support.html
+ which has proven to be robust.
+
+ * media/modern-media-controls/audio/audio-controls-buttons-expected.txt:
+ * media/modern-media-controls/audio/audio-controls-buttons.html:
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2017-03-01 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2][!NETWORK_SESSION] Failure to download when using a download attribute with no value on an anchor
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsaudioaudiocontrolsbuttonsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-buttons-expected.txt (213253 => 213254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-buttons-expected.txt 2017-03-02 00:28:27 UTC (rev 213253)
+++ trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-buttons-expected.txt 2017-03-02 02:07:41 UTC (rev 213254)
</span><span class="lines">@@ -3,10 +3,11 @@
</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><ins>+Making AirPlay routes available.
</ins><span class="cx"> AirPlay routes became available.
</span><del>-PASS mediaController.controls.controlsBar.children[2].children.length is 2
-PASS mediaController.controls.controlsBar.children[2].children[0] is mediaController.controls.muteButton
-PASS mediaController.controls.controlsBar.children[2].children[1] is mediaController.controls.airplayButton
</del><ins>+PASS mediaController.controls.rightContainer.children.length is 2
+PASS mediaController.controls.rightContainer.children[0] is mediaController.controls.muteButton
+PASS mediaController.controls.rightContainer.children[1] is mediaController.controls.airplayButton
</ins><span class="cx">
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsaudioaudiocontrolsbuttonshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-buttons.html (213253 => 213254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-buttons.html 2017-03-02 00:28:27 UTC (rev 213253)
+++ trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-buttons.html 2017-03-02 02:07:41 UTC (rev 213254)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> <script src="../resources/media-controls-loader.js" type="text/javascript"></script>
</span><span class="cx"> <script src="../resources/media-controls-utils.js" type="text/javascript"></script>
</span><span class="cx"> <body>
</span><del>-<audio src="../../content/test.mp4" style="width: 600px; height: 50px;" autoplay controls></audio>
</del><ins>+<audio src="../../content/test.mp4" style="width: 600px; height: 50px;" controls></audio>
</ins><span class="cx"> <div id="container"></div>
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx">
</span><span class="lines">@@ -14,30 +14,42 @@
</span><span class="cx"> const media = document.querySelector("audio");
</span><span class="cx"> const mediaController = createControls(shadowRoot, media, null);
</span><span class="cx">
</span><del>-window.internals.setMockMediaPlaybackTargetPickerEnabled(false);
</del><ins>+media.addEventListener("canplay", makeAirPlayAvailable);
</ins><span class="cx">
</span><del>-media.addEventListener("webkitplaybacktargetavailabilitychanged", playbackTargetAvailabilityChanged);
</del><ins>+function makeAirPlayAvailable()
+{
+ debug("Making AirPlay routes available.");
+ media.addEventListener("webkitplaybacktargetavailabilitychanged", playbackTargetAvailabilityChangedOnce, true);
+ window.internals.setMockMediaPlaybackTargetPickerEnabled(true);
+}
</ins><span class="cx">
</span><del>-function playbackTargetAvailabilityChanged(event)
</del><ins>+function playbackTargetAvailabilityChangedOnce(event)
</ins><span class="cx"> {
</span><del>- if (event.availability != "available")
</del><ins>+ media.removeEventListener('webkitplaybacktargetavailabilitychanged', playbackTargetAvailabilityChangedOnce, true);
+ media.addEventListener('webkitplaybacktargetavailabilitychanged', playbackTargetAvailabilityChangedAgain, true);
+
+ window.internals.setMockMediaPlaybackTargetPickerState('Sleepy TV', 'DeviceAvailable');
+}
+
+function playbackTargetAvailabilityChangedAgain(event)
+{
+ // setMockMediaPlaybackTargetPickerState happens asynchronously in WK2 and a
+ // "webkitplaybacktargetavailabilitychanged" is always sent when an event listener
+ // is added, so we may get a "not available" event first.
+ if (event.availability == 'not-available')
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- media.removeEventListener("webkitplaybacktargetavailabilitychanged", playbackTargetAvailabilityChanged);
-
</del><span class="cx"> debug("AirPlay routes became available.");
</span><ins>+ media.removeEventListener('webkitplaybacktargetavailabilitychanged', playbackTargetAvailabilityChangedAgain, true);
</ins><span class="cx">
</span><del>- scheduler.frameDidFire = function()
- {
- shouldBe("mediaController.controls.controlsBar.children[2].children.length", "2");
- shouldBe("mediaController.controls.controlsBar.children[2].children[0]", "mediaController.controls.muteButton");
- shouldBe("mediaController.controls.controlsBar.children[2].children[1]", "mediaController.controls.airplayButton");
</del><ins>+ shouldBe("mediaController.controls.rightContainer.children.length", "2");
+ shouldBe("mediaController.controls.rightContainer.children[0]", "mediaController.controls.muteButton");
+ shouldBe("mediaController.controls.rightContainer.children[1]", "mediaController.controls.airplayButton");
</ins><span class="cx">
</span><del>- debug("");
- shadowRoot.remove();
- media.remove();
- finishMediaControlsTest();
- };
</del><ins>+ debug("");
+ shadowRoot.remove();
+ media.remove();
+ finishJSTest();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (213253 => 213254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2017-03-02 00:28:27 UTC (rev 213253)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2017-03-02 02:07:41 UTC (rev 213254)
</span><span class="lines">@@ -1479,9 +1479,6 @@
</span><span class="cx"> media/modern-media-controls/media-controller/media-controller-ios-do-not-hide-controls-when-tapping-button.html [ Skip ]
</span><span class="cx"> media/modern-media-controls/media-controller/media-controller-tight-padding.html [ Skip ]
</span><span class="cx">
</span><del>-# This one always times out on the bots, cannot reproduce locally.
-webkit.org/b/165234 media/modern-media-controls/audio/audio-controls-buttons.html [ Skip ]
-
</del><span class="cx"> webkit.org/b/167263 media/modern-media-controls/media-controller/media-controller-auto-hide.html [ Pass Failure ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/167275 media/modern-media-controls/tracks-support/tracks-support-show-panel-after-dragging-controls.html [ Pass Failure ]
</span></span></pre>
</div>
</div>
</body>
</html>