<!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>[211132] 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/211132">211132</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-24 18:59:59 -0800 (Tue, 24 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>LayoutTest media/modern-media-controls/placard-support/placard-support-airplay.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=164298
Patch by Antoine Quint <graouts@apple.com> on 2017-01-24
Reviewed by Jon Lee.
Make media/modern-media-controls/placard-support/placard-support-airplay.html more robust by
following the same pattern used in media/airplay-target-availability.html which proved to be robust.
* media/modern-media-controls/placard-support/placard-support-airplay-expected.txt:
* media/modern-media-controls/placard-support/placard-support-airplay.html:
* platform/mac/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsplacardsupportplacardsupportairplayexpectedtxt">trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-airplay-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsplacardsupportplacardsupportairplayhtml">trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-airplay.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 (211131 => 211132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-01-25 02:59:11 UTC (rev 211131)
+++ trunk/LayoutTests/ChangeLog 2017-01-25 02:59:59 UTC (rev 211132)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2017-01-24 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><ins>+ LayoutTest media/modern-media-controls/placard-support/placard-support-airplay.html is flaky
+ https://bugs.webkit.org/show_bug.cgi?id=164298
+
+ Reviewed by Jon Lee.
+
+ Make media/modern-media-controls/placard-support/placard-support-airplay.html more robust by
+ following the same pattern used in media/airplay-target-availability.html which proved to be robust.
+
+ * media/modern-media-controls/placard-support/placard-support-airplay-expected.txt:
+ * media/modern-media-controls/placard-support/placard-support-airplay.html:
+ * platform/mac/TestExpectations:
+
+2017-01-24 Antoine Quint <graouts@apple.com>
+
</ins><span class="cx"> LayoutTest media/modern-media-controls/tracks-panel/tracks-panel-hide.html is a flaky timeout
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=167311
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsplacardsupportplacardsupportairplayexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-airplay-expected.txt (211131 => 211132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-airplay-expected.txt 2017-01-25 02:59:11 UTC (rev 211131)
+++ trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-airplay-expected.txt 2017-01-25 02:59:59 UTC (rev 211132)
</span><span class="lines">@@ -3,10 +3,9 @@
</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>-got event false
-got event true
</del><span class="cx"> PASS mediaController.controls.showsPlacard is true
</span><span class="cx"> PASS mediaController.controls.children.includes(mediaController.controls.airplayPlacard) is true
</span><ins>+
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsplacardsupportplacardsupportairplayhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-airplay.html (211131 => 211132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-airplay.html 2017-01-25 02:59:11 UTC (rev 211131)
+++ trunk/LayoutTests/media/modern-media-controls/placard-support/placard-support-airplay.html 2017-01-25 02:59:59 UTC (rev 211132)
</span><span class="lines">@@ -23,34 +23,57 @@
</span><span class="cx">
</span><span class="cx"> description("Testing the <code>PlacardSupport</code> behavior when playing media through AirPlay.");
</span><span class="cx">
</span><del>-iconService.directoryPath = "../../../../Source/WebCore/Modules/modern-media-controls/images";
-
</del><span class="cx"> const container = document.querySelector("div#host");
</span><span class="cx"> const media = document.querySelector("video");
</span><span class="cx"> const mediaController = createControls(container, media, null);
</span><span class="cx">
</span><del>-if (window.internals) {
- window.internals.settings.setAllowsAirPlayForMediaPlayback(true);
- window.internals.setMediaElementRestrictions(media, "norestrictions");
</del><ins>+(function makeAirPlayAvailable()
+{
+ media.addEventListener("webkitplaybacktargetavailabilitychanged", playbackTargetAvailabilityChangedOnce, true);
+ window.internals.setMockMediaPlaybackTargetPickerEnabled(true);
+})();
+
+function playbackTargetAvailabilityChangedOnce(event)
+{
+ media.removeEventListener('webkitplaybacktargetavailabilitychanged', playbackTargetAvailabilityChangedOnce, true);
+ media.addEventListener('webkitplaybacktargetavailabilitychanged', playbackTargetAvailabilityChangedAgain, true);
+
+ window.internals.setMockMediaPlaybackTargetPickerState('Sleepy TV', 'DeviceAvailable');
</ins><span class="cx"> }
</span><ins>+
+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')
+ return;
</ins><span class="cx">
</span><del>-media.addEventListener("webkitcurrentplaybacktargetiswirelesschanged", () => {
- if (!media.paused && media.webkitCurrentPlaybackTargetIsWireless) {
- shouldBeTrue("mediaController.controls.showsPlacard");
- shouldBeTrue("mediaController.controls.children.includes(mediaController.controls.airplayPlacard)");
</del><ins>+ media.removeEventListener('webkitplaybacktargetavailabilitychanged', playbackTargetAvailabilityChangedAgain, true);
</ins><span class="cx">
</span><del>- container.remove();
- media.remove();
- finishJSTest();
- }
-});
</del><ins>+ window.setTimeout(enterAirPlay, 100);
+}
</ins><span class="cx">
</span><del>-media.addEventListener("play", () => {
</del><ins>+function enterAirPlay()
+{
+ media.addEventListener("webkitcurrentplaybacktargetiswirelesschanged", currentPlaybackTargetIsWirelessChanged);
</ins><span class="cx"> media.webkitShowPlaybackTargetPicker();
</span><del>- if (window.internals)
- window.internals.setMockMediaPlaybackTargetPickerState("Sleepy TV", "DeviceAvailable");
-});
</del><ins>+}
</ins><span class="cx">
</span><ins>+function currentPlaybackTargetIsWirelessChanged(event)
+{
+ if (!media.webkitCurrentPlaybackTargetIsWireless)
+ return;
+
+ shouldBeTrue("mediaController.controls.showsPlacard");
+ shouldBeTrue("mediaController.controls.children.includes(mediaController.controls.airplayPlacard)");
+
+ debug("");
+ container.remove();
+ media.remove();
+ finishJSTest();
+}
+
</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="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (211131 => 211132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2017-01-25 02:59:11 UTC (rev 211131)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2017-01-25 02:59:59 UTC (rev 211132)
</span><span class="lines">@@ -1480,7 +1480,6 @@
</span><span class="cx">
</span><span class="cx"> # These sometimes work but more often than not don't
</span><span class="cx"> webkit.org/b/164323 media/modern-media-controls/airplay-support/airplay-support.html [ Pass Failure ]
</span><del>-webkit.org/b/164298 media/modern-media-controls/placard-support/placard-support-airplay.html [ Pass Failure Timeout ]
</del><span class="cx">
</span><span class="cx"> # This one always times out on the bots, cannot reproduce locally.
</span><span class="cx"> webkit.org/b/165234 media/modern-media-controls/audio/audio-controls-buttons.html [ Pass Timeout ]
</span></span></pre>
</div>
</div>
</body>
</html>