<!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>[195592] 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/195592">195592</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-26 09:17:49 -0800 (Tue, 26 Jan 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>LayoutTest media/airplay-target-availability.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=153100
&lt;rdar://problem/24346796&gt;

Reviewed by Daniel Bates.

Source/WebCore:

No new tests, media/airplay-target-availability.html was updated

* Modules/mediasession/WebMediaSessionManager.cpp:
(WebCore::WebMediaSessionManager::clientStateDidChange): Schedule a configuration scan if
  any of the config flags have changed.
(WebCore::WebMediaSessionManager::configurePlaybackTargetMonitoring): Update logging.

LayoutTests:

* media/airplay-target-availability-expected.txt:
* media/airplay-target-availability.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediaairplaytargetavailabilityexpectedtxt">trunk/LayoutTests/media/airplay-target-availability-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediaairplaytargetavailabilityhtml">trunk/LayoutTests/media/airplay-target-availability.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionWebMediaSessionManagercpp">trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195591 => 195592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-01-26 17:00:18 UTC (rev 195591)
+++ trunk/LayoutTests/ChangeLog        2016-01-26 17:17:49 UTC (rev 195592)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-01-26  Eric Carlson  &lt;eric.carlson@apple.com&gt;
+
+        LayoutTest media/airplay-target-availability.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=153100
+        &lt;rdar://problem/24346796&gt;
+
+        Reviewed by Daniel Bates.
+
+        * media/airplay-target-availability-expected.txt:
+        * media/airplay-target-availability.html:
+
</ins><span class="cx"> 2016-01-26  Daniel Bates  &lt;dabates@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         LayoutTest http/tests/security/xssAuditor/embed-tag-in-path-unterminated.html crashing
</span></span></pre></div>
<a id="trunkLayoutTestsmediaairplaytargetavailabilityexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/airplay-target-availability-expected.txt (195591 => 195592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/airplay-target-availability-expected.txt        2016-01-26 17:00:18 UTC (rev 195591)
+++ trunk/LayoutTests/media/airplay-target-availability-expected.txt        2016-01-26 17:17:49 UTC (rev 195592)
</span><span class="lines">@@ -2,15 +2,15 @@
</span><span class="cx"> 
</span><span class="cx"> Test that 'webkitplaybacktargetavailabilitychanged' event is sent when at least one video element has playable media.
</span><span class="cx"> 
</span><ins>+EVENT( webkitplaybacktargetavailabilitychanged )
+EXPECTED (event.availability == 'not-available') OK
</ins><span class="cx"> 
</span><del>-EVENT: 'webkitplaybacktargetavailabilitychanged', event.availability = 'not-available'
</del><ins>+** simulate device becoming available
+EVENT( webkitplaybacktargetavailabilitychanged )
</ins><span class="cx"> 
</span><ins>+** set src on video that does not have event listener
+EVENT( webkitplaybacktargetavailabilitychanged )
+EXPECTED (event.availability == 'available') OK
</ins><span class="cx"> 
</span><del>-EVENT: 'webkitplaybacktargetavailabilitychanged', event.availability = 'not-available'
-
-** setting src on video that does not have event listener
-
-EVENT: 'webkitplaybacktargetavailabilitychanged', event.availability = 'available'
-
</del><span class="cx"> END OF TEST
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsmediaairplaytargetavailabilityhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/airplay-target-availability.html (195591 => 195592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/airplay-target-availability.html        2016-01-26 17:00:18 UTC (rev 195591)
+++ trunk/LayoutTests/media/airplay-target-availability.html        2016-01-26 17:17:49 UTC (rev 195592)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> &lt;html&gt;
</span><span class="cx">     &lt;head&gt;
</span><del>-        &lt;script src=&quot;media-file.js&quot;&gt;&lt;/script&gt;
-        &lt;script src=&quot;video-test.js&quot;&gt;&lt;/script&gt;
</del><ins>+        &lt;script src='media-file.js'&gt;&lt;/script&gt;
+        &lt;script src='video-test.js'&gt;&lt;/script&gt;
</ins><span class="cx">         &lt;script&gt;
</span><span class="cx">             var video1;
</span><span class="cx">             var video2;
</span><span class="lines">@@ -13,38 +13,53 @@
</span><span class="cx"> 
</span><span class="cx">                 if (window.internals)
</span><span class="cx">                     internals.setMockMediaPlaybackTargetPickerEnabled(true);
</span><del>-
-                video1.addEventListener('webkitplaybacktargetavailabilitychanged', targetAvailabilityChanged);
-                setTimeout(setSource, 200);
</del><ins>+                
+                video1.addEventListener('webkitplaybacktargetavailabilitychanged', noSource, true);
</ins><span class="cx">             }
</span><span class="cx">             
</span><del>-            function targetAvailabilityChanged(event)
</del><ins>+            function noSource(event)
</ins><span class="cx">             {
</span><del>-                consoleWrite(`&lt;br&gt;EVENT: '${event.type}', event.availability = '${event.availability}'&lt;br&gt;`);
</del><ins>+                video1.removeEventListener('webkitplaybacktargetavailabilitychanged', noSource, true);
</ins><span class="cx"> 
</span><del>-                if (event.availability != &quot;available&quot;)
-                    return;
</del><ins>+                consoleWrite(`EVENT( ${event.type} )`);
+                testExpected('event.availability', 'not-available');
</ins><span class="cx"> 
</span><del>-                if (event.availability == &quot;available&quot; &amp;&amp; video2.src == &quot;&quot;) {
-                    failTest(&quot;Event sent before any video is a candidate for airplay&quot;);
-                    return;
-                }
</del><ins>+                video1.addEventListener('webkitplaybacktargetavailabilitychanged', haveTarget, true);
+
+                consoleWrite('&lt;br&gt;** simulate device becoming available');
+                if (window.internals)
+                    internals.setMockMediaPlaybackTargetPickerState('Sleepy TV', 'DeviceAvailable');
+            }
</ins><span class="cx">                 
</span><del>-                endTest();
-            }
-            
-            function setSource()
</del><ins>+            function haveTarget(event)
</ins><span class="cx">             {
</span><del>-                consoleWrite('** setting src on video that does not have event listener');
-                if (window.internals)
-                    internals.setMockMediaPlaybackTargetPickerState(&quot;Sleepy TV&quot;, &quot;DeviceAvailable&quot;);
</del><ins>+                // setMockMediaPlaybackTargetPickerState happens asynchronously in WK2 and a
+                // 'webkitplaybacktargetavailabilitychanged' is always sent when an event listener
+                // is added, so we may get a &quot;not available&quot; event first.
+                if (event.availability == 'not-available')
+                    return;
+
+                video1.removeEventListener('webkitplaybacktargetavailabilitychanged', haveTarget, true);
+                consoleWrite(`EVENT( ${event.type} )`);
+
+                consoleWrite('&lt;br&gt;** set src on video that does not have event listener');
+
</ins><span class="cx">                 video2.src = findMediaFile('video', 'content/test');
</span><ins>+                video1.addEventListener('webkitplaybacktargetavailabilitychanged', withSource, true);
</ins><span class="cx">             }
</span><span class="cx"> 
</span><ins>+            function withSource(event)
+            {
+                consoleWrite(`EVENT( ${event.type} )`);
+                testExpected('event.availability', 'available');
+                consoleWrite('');
+                endTest();
+            }
+
</ins><span class="cx">         &lt;/script&gt;
</span><span class="cx">     &lt;/head&gt;
</span><span class="cx"> 
</span><del>-    &lt;body onload=&quot;start()&quot;&gt;
</del><ins>+    &lt;body onload='start()'&gt;
</ins><span class="cx">         &lt;video controls&gt;&lt;/video&gt;
</span><span class="cx">         &lt;br&gt;
</span><span class="cx">         &lt;video controls&gt;&lt;/video&gt;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195591 => 195592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-01-26 17:00:18 UTC (rev 195591)
+++ trunk/Source/WebCore/ChangeLog        2016-01-26 17:17:49 UTC (rev 195592)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-01-26  Eric Carlson  &lt;eric.carlson@apple.com&gt;
+
+        LayoutTest media/airplay-target-availability.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=153100
+        &lt;rdar://problem/24346796&gt;
+
+        Reviewed by Daniel Bates.
+
+        No new tests, media/airplay-target-availability.html was updated
+
+        * Modules/mediasession/WebMediaSessionManager.cpp:
+        (WebCore::WebMediaSessionManager::clientStateDidChange): Schedule a configuration scan if
+          any of the config flags have changed.
+        (WebCore::WebMediaSessionManager::configurePlaybackTargetMonitoring): Update logging.
+
</ins><span class="cx"> 2016-01-25  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Main frame scrollbars not updated on hovering when using overlay scrollbars
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionWebMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp (195591 => 195592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp        2016-01-26 17:00:18 UTC (rev 195591)
+++ trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp        2016-01-26 17:17:49 UTC (rev 195592)
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx">     changedClientState-&gt;flags = newFlags;
</span><span class="cx"> 
</span><span class="cx">     MediaProducer::MediaStateFlags updateConfigurationFlags = MediaProducer::RequiresPlaybackTargetMonitoring | MediaProducer::HasPlaybackTargetAvailabilityListener | MediaProducer::HasAudioOrVideo;
</span><del>-    if (!flagsAreSet(oldFlags, updateConfigurationFlags) &amp;&amp; flagsAreSet(newFlags, updateConfigurationFlags))
</del><ins>+    if ((oldFlags &amp; updateConfigurationFlags) != (newFlags &amp; updateConfigurationFlags))
</ins><span class="cx">         scheduleDelayedTask(TargetMonitoringConfigurationTask);
</span><span class="cx"> 
</span><span class="cx">     MediaProducer::MediaStateFlags playingToTargetFlags = MediaProducer::IsPlayingToExternalDevice | MediaProducer::IsPlayingVideo;
</span><span class="lines">@@ -358,7 +358,7 @@
</span><span class="cx">             haveClientWithMedia = true;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    LOG(Media, &quot;WebMediaSessionManager::configurePlaybackTargetMonitoring - monitoringRequired = %i&quot;, (int)monitoringRequired);
</del><ins>+    LOG(Media, &quot;WebMediaSessionManager::configurePlaybackTargetMonitoring - monitoringRequired = %i&quot;, static_cast&lt;int&gt;(monitoringRequired || (hasAvailabilityListener &amp;&amp; haveClientWithMedia)));
</ins><span class="cx"> 
</span><span class="cx">     if (monitoringRequired || (hasAvailabilityListener &amp;&amp; haveClientWithMedia))
</span><span class="cx">         targetPicker().startingMonitoringPlaybackTargets();
</span></span></pre>
</div>
</div>

</body>
</html>