<!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>[207005] 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/207005">207005</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-10-10 10:17:41 -0700 (Mon, 10 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Address flaky airplay-* LayouTests
https://bugs.webkit.org/show_bug.cgi?id=163044
Reviewed by Brent Fulgham.
Source/WebCore:
Two separate problems conspired to make airplay tests a bit flaky:
For one, when the HTMLMediaElement clears its MediaPlayer, it won't necessarily notify
clients that it has stopped playing to a wireless target. The WebMediaSessionManager may
eventually cause this value to reset, but it's asynchronous, and may fire after the next
test starts. Reset this state explicitly.
For two, the state of the mock playback target picker was not being reset between test
invocations.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::clearMediaPlayer):
* testing/Internals.cpp:
(WebCore::Internals::resetToConsistentState):
LayoutTests:
* media/airplay-autoplay.html:
* platform/mac/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediaairplayautoplayhtml">trunk/LayoutTests/media/airplay-autoplay.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207004 => 207005)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-10 17:12:34 UTC (rev 207004)
+++ trunk/LayoutTests/ChangeLog 2016-10-10 17:17:41 UTC (rev 207005)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-10-10 Jer Noble <jer.noble@apple.com>
+
+ Address flaky airplay-* LayouTests
+ https://bugs.webkit.org/show_bug.cgi?id=163044
+
+ Reviewed by Brent Fulgham.
+
+ * media/airplay-autoplay.html:
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2016-10-10 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking http/tests/xmlhttprequest/onabort-response-getters.html as flaky on ios-simulator.
</span></span></pre></div>
<a id="trunkLayoutTestsmediaairplayautoplayhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/airplay-autoplay.html (207004 => 207005)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/airplay-autoplay.html 2016-10-10 17:12:34 UTC (rev 207004)
+++ trunk/LayoutTests/media/airplay-autoplay.html 2016-10-10 17:17:41 UTC (rev 207005)
</span><span class="lines">@@ -8,11 +8,6 @@
</span><span class="cx">
</span><span class="cx"> var phase = 'video-1';
</span><span class="cx">
</span><del>- if (window.internals) {
- internals.setMockMediaPlaybackTargetPickerEnabled(true);
- internals.setMockMediaPlaybackTargetPickerState('', 'Unknown');
- }
-
</del><span class="cx"> function start()
</span><span class="cx"> {
</span><span class="cx"> findMediaElement();
</span><span class="lines">@@ -31,10 +26,8 @@
</span><span class="cx"> runWithKeyDown(function() {
</span><span class="cx"> run(`video.webkitShowPlaybackTargetPicker()`);
</span><span class="cx"> setTimeout(function() {
</span><del>- if (window.internals) {
- internals.setMockMediaPlaybackTargetPickerEnabled(true);
</del><ins>+ if (window.internals)
</ins><span class="cx"> internals.setMockMediaPlaybackTargetPickerState('Sleepy TV', 'DeviceAvailable');
</span><del>- }
</del><span class="cx"> }, 100);
</span><span class="cx"> });
</span><span class="cx"> video.currentTime = video.duration - 1;
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (207004 => 207005)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-10-10 17:12:34 UTC (rev 207004)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-10-10 17:17:41 UTC (rev 207005)
</span><span class="lines">@@ -1160,9 +1160,6 @@
</span><span class="cx"> # See also: rdar://problem/27356144
</span><span class="cx"> webkit.org/b/142726 fast/images/animated-png.html [ Skip ]
</span><span class="cx">
</span><del>-# Fails when an actual AppleTV is nearby.
-webkit.org/b/148912 [ ElCapitan+ ] media/controls/airplay-picker.html [ Pass Failure ]
-
</del><span class="cx"> # OS X 10.10.3+ has the necessary glyphs.
</span><span class="cx"> webkit.org/b/142548 [ Yosemite+ ] editing/selection/extend-by-character-007.html [ Pass ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207004 => 207005)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-10 17:12:34 UTC (rev 207004)
+++ trunk/Source/WebCore/ChangeLog 2016-10-10 17:17:41 UTC (rev 207005)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-10-10 Jer Noble <jer.noble@apple.com>
+
+ Address flaky airplay-* LayouTests
+ https://bugs.webkit.org/show_bug.cgi?id=163044
+
+ Reviewed by Brent Fulgham.
+
+ Two separate problems conspired to make airplay tests a bit flaky:
+
+ For one, when the HTMLMediaElement clears its MediaPlayer, it won't necessarily notify
+ clients that it has stopped playing to a wireless target. The WebMediaSessionManager may
+ eventually cause this value to reset, but it's asynchronous, and may fire after the next
+ test starts. Reset this state explicitly.
+
+ For two, the state of the mock playback target picker was not being reset between test
+ invocations.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::clearMediaPlayer):
+ * testing/Internals.cpp:
+ (WebCore::Internals::resetToConsistentState):
+
</ins><span class="cx"> 2016-10-10 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Correct typo in comment (patining -> painting).
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (207004 => 207005)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-10-10 17:12:34 UTC (rev 207004)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-10-10 17:17:41 UTC (rev 207005)
</span><span class="lines">@@ -5048,6 +5048,11 @@
</span><span class="cx"> // doesn't support playback to a target.
</span><span class="cx"> enqueuePlaybackTargetAvailabilityChangedEvent();
</span><span class="cx"> }
</span><ins>+
+ if (m_isPlayingToWirelessTarget) {
+ m_isPlayingToWirelessTarget = false;
+ scheduleEvent(eventNames().webkitcurrentplaybacktargetiswirelesschangedEvent);
+ }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (m_isWaitingUntilMediaCanStart) {
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (207004 => 207005)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2016-10-10 17:12:34 UTC (rev 207004)
+++ trunk/Source/WebCore/testing/Internals.cpp 2016-10-10 17:17:41 UTC (rev 207005)
</span><span class="lines">@@ -408,6 +408,11 @@
</span><span class="cx"> MockContentFilterSettings::reset();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+ page.setMockMediaPlaybackTargetPickerEnabled(true);
+ page.setMockMediaPlaybackTargetPickerState(emptyString(), MediaPlaybackTargetContext::Unknown);
+#endif
+
</ins><span class="cx"> page.setShowAllPlugins(false);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>