<!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>[201522] 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/201522">201522</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2016-05-31 13:47:53 -0700 (Tue, 31 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] AirPlay route is sometimes reset when changing video.src
https://bugs.webkit.org/show_bug.cgi?id=158226
<rdar://problem/24197592>
Reviewed by Jer Noble.
Source/WebCore:
Test: media/airplay-autoplay.html
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::webkitShowPlaybackTargetPicker): Remove the gesture requirement
if currently processing a user gesture.
(WebCore::HTMLMediaElement::dispatchEvent): Set m_failedToPlayToWirelessTarget to false when
dispatching webkitcurrentplaybacktargetiswirelesschanged so an element can succeed after failing.
LayoutTests:
* media/airplay-autoplay-expected.txt: Added.
* media/airplay-autoplay.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediaairplayautoplayexpectedtxt">trunk/LayoutTests/media/airplay-autoplay-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediaairplayautoplayhtml">trunk/LayoutTests/media/airplay-autoplay.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201521 => 201522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-05-31 20:32:21 UTC (rev 201521)
+++ trunk/LayoutTests/ChangeLog        2016-05-31 20:47:53 UTC (rev 201522)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-05-31 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] AirPlay route is sometimes reset when changing video.src
+ https://bugs.webkit.org/show_bug.cgi?id=158226
+ <rdar://problem/24197592>
+
+ Reviewed by Jer Noble.
+
+ * media/airplay-autoplay-expected.txt: Added.
+ * media/airplay-autoplay.html: Added.
+
</ins><span class="cx"> 2016-05-31 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r189567): Elements with aspect ratios not handled correctly inside flexbox.
</span></span></pre></div>
<a id="trunkLayoutTestsmediaairplayautoplayexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/airplay-autoplay-expected.txt (0 => 201522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/airplay-autoplay-expected.txt         (rev 0)
+++ trunk/LayoutTests/media/airplay-autoplay-expected.txt        2016-05-31 20:47:53 UTC (rev 201522)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+
+** set video.src
+RUN(video.src = findMediaFile('video', 'content/test'))
+
+EVENT(canplaythrough)
+
+** simulate choosing a device from the menu
+RUN(video.webkitShowPlaybackTargetPicker())
+EVENT(webkitcurrentplaybacktargetiswirelesschanged)
+
+** start playing
+RUN(video.play())
+
+EVENT(ended)
+
+** reset video source
+RUN(video.src = findMediaFile('video', 'content/test'))
+RUN(video.play())
+
+EVENT(webkitcurrentplaybacktargetiswirelesschanged)
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediaairplayautoplayhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/airplay-autoplay.html (0 => 201522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/airplay-autoplay.html         (rev 0)
+++ trunk/LayoutTests/media/airplay-autoplay.html        2016-05-31 20:47:53 UTC (rev 201522)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <title>AirPlay target should persist across src change</title>
+ <script src="media-file.js"></script>
+ <script src="video-test.js"></script>
+ <script>
+
+ var phase = 'video-1';
+
+ if (window.internals) {
+ internals.setMockMediaPlaybackTargetPickerEnabled(true);
+ internals.setMockMediaPlaybackTargetPickerState('', 'Unknown');
+ }
+
+ function start()
+ {
+ findMediaElement();
+
+ consoleWrite('** set video.src');
+ run(`video.src = findMediaFile('video', 'content/test')`);
+ video.addEventListener('webkitcurrentplaybacktargetiswirelesschanged', currentTargetChanged, true);
+ waitForEventOnce('canplaythrough', canplaythrough);
+ waitForEventOnce('ended', ended);
+ consoleWrite('');
+ }
+
+ function canplaythrough()
+ {
+ consoleWrite('<br>** simulate choosing a device from the menu');
+ runWithKeyDown(function() {
+ run(`video.webkitShowPlaybackTargetPicker()`);
+ setTimeout(function() {
+ if (window.internals) {
+ internals.setMockMediaPlaybackTargetPickerEnabled(true);
+ internals.setMockMediaPlaybackTargetPickerState('Sleepy TV', 'DeviceAvailable');
+ }
+ }, 100);
+ });
+ video.currentTime = video.duration - 1;
+ }
+
+ function currentTargetChanged(ev)
+ {
+ if (!video.webkitCurrentPlaybackTargetIsWireless)
+ return;
+
+ consoleWrite(`EVENT(${ev.type})`);
+ switch (phase) {
+ case 'video-1':
+ phase = 'video-2';
+ consoleWrite('<br>** start playing');
+ run(`video.play()`);
+ consoleWrite('');
+ break;
+ case 'video-2':
+ endTest();
+ break;
+ }
+ }
+
+ function ended()
+ {
+ consoleWrite('<br>** reset video source');
+ run(`video.src = findMediaFile('video', 'content/test')`);
+ run(`video.play()`);
+ consoleWrite('');
+ }
+
+ </script>
+</head>
+<body onload="start()">
+ <video controls></video>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (201521 => 201522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations        2016-05-31 20:32:21 UTC (rev 201521)
+++ trunk/LayoutTests/platform/mac/TestExpectations        2016-05-31 20:47:53 UTC (rev 201522)
</span><span class="lines">@@ -1293,6 +1293,7 @@
</span><span class="cx"> # WIRELESS_PLAYBACK_TARGET not enabled on Yosemite.
</span><span class="cx"> [ Yosemite ] media/airplay-target-availability.html
</span><span class="cx"> [ Yosemite ] media/controls/airplay-picker.html
</span><ins>+[ Yosemite ] media/airplay-autoplay.html
</ins><span class="cx">
</span><span class="cx"> webkit.org/b/153086 sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/15.1.3/15.1.3.3_encodeURI/S15.1.3.3_A2.4_T2.html [ Pass Crash ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201521 => 201522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-05-31 20:32:21 UTC (rev 201521)
+++ trunk/Source/WebCore/ChangeLog        2016-05-31 20:47:53 UTC (rev 201522)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-05-31 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] AirPlay route is sometimes reset when changing video.src
+ https://bugs.webkit.org/show_bug.cgi?id=158226
+ <rdar://problem/24197592>
+
+ Reviewed by Jer Noble.
+
+ Test: media/airplay-autoplay.html
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::webkitShowPlaybackTargetPicker): Remove the gesture requirement
+ if currently processing a user gesture.
+ (WebCore::HTMLMediaElement::dispatchEvent): Set m_failedToPlayToWirelessTarget to false when
+ dispatching webkitcurrentplaybacktargetiswirelesschanged so an element can succeed after failing.
+
</ins><span class="cx"> 2016-05-31 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Regression(r201482): Crash under dispatch_semaphore_wait
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (201521 => 201522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp        2016-05-31 20:32:21 UTC (rev 201521)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp        2016-05-31 20:47:53 UTC (rev 201522)
</span><span class="lines">@@ -5186,6 +5186,8 @@
</span><span class="cx"> void HTMLMediaElement::webkitShowPlaybackTargetPicker()
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "HTMLMediaElement::webkitShowPlaybackTargetPicker(%p)", this);
</span><ins>+ if (ScriptController::processingUserGestureForMedia())
+ removeBehaviorsRestrictionsAfterFirstUserGesture();
</ins><span class="cx"> m_mediaSession->showPlaybackTargetPicker(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5213,8 +5215,10 @@
</span><span class="cx">
</span><span class="cx"> bool HTMLMediaElement::dispatchEvent(Event& event)
</span><span class="cx"> {
</span><del>- if (event.type() == eventNames().webkitcurrentplaybacktargetiswirelesschangedEvent)
</del><ins>+ if (event.type() == eventNames().webkitcurrentplaybacktargetiswirelesschangedEvent) {
+ m_failedToPlayToWirelessTarget = false;
</ins><span class="cx"> scheduleDelayedAction(CheckPlaybackTargetCompatablity);
</span><ins>+ }
</ins><span class="cx"> return HTMLElement::dispatchEvent(event);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>