<!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>[195068] branches/safari-601-branch</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/195068">195068</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-14 11:19:34 -0800 (Thu, 14 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/194672">r194672</a>. rdar://problem/24154288</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchLayoutTestsplatformeflTestExpectations">branches/safari-601-branch/LayoutTests/platform/efl/TestExpectations</a></li>
<li><a href="#branchessafari601branchLayoutTestsplatformgtkTestExpectations">branches/safari-601-branch/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#branchessafari601branchLayoutTestsplatformmacTestExpectations">branches/safari-601-branch/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#branchessafari601branchLayoutTestsplatformwinTestExpectations">branches/safari-601-branch/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreModulesmediasessionWebMediaSessionManagercpp">branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlHTMLMediaElementcpp">branches/safari-601-branch/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlHTMLMediaElementh">branches/safari-601-branch/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorepageMediaProducerh">branches/safari-601-branch/Source/WebCore/page/MediaProducer.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsMediaPlaybackTargetContexth">branches/safari-601-branch/Source/WebCore/platform/graphics/MediaPlaybackTargetContext.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformmockMediaPlaybackTargetMockh">branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetMock.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformmockMediaPlaybackTargetPickerMockcpp">branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformmockMediaPlaybackTargetPickerMockh">branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoretestingInternalscpp">branches/safari-601-branch/Source/WebCore/testing/Internals.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsmediaairplaytargetavailabilityexpectedtxt">branches/safari-601-branch/LayoutTests/media/airplay-target-availability-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsmediaairplaytargetavailabilityhtml">branches/safari-601-branch/LayoutTests/media/airplay-target-availability.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (195067 => 195068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2016-01-14 19:19:28 UTC (rev 195067)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2016-01-14 19:19:34 UTC (rev 195068)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-01-14 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r194672. rdar://problem/24154288
+
+ 2016-01-06 Eric Carlson <eric.carlson@apple.com>
+
+ AirPlay route availability event not always sent
+ https://bugs.webkit.org/show_bug.cgi?id=152802
+
+ Reviewed by Jer Noble.
+
+ * media/airplay-target-availability-expected.txt: Added.
+ * media/airplay-target-availability.html: Added.
+ * platform/mac/TestExpectations: Skip new test on Yosemite.
+ * platform/efl/TestExpectations: Skip new test.
+ * platform/gtk/TestExpectations: Ditto.
+ * platform/win/TestExpectations: Ditto.
+
+2016-01-14 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r192200. rdar://problem/24154288
</span><span class="cx">
</span><span class="cx"> 2015-11-09 Eric Carlson <eric.carlson@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsmediaairplaytargetavailabilityexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/media/airplay-target-availability-expected.txt (0 => 195068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/media/airplay-target-availability-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/media/airplay-target-availability-expected.txt 2016-01-14 19:19:34 UTC (rev 195068)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+
+
+Test that 'webkitplaybacktargetavailabilitychanged' event is sent when at least one video element has playable media.
+
+
+EVENT: 'webkitplaybacktargetavailabilitychanged', event.availability = 'not-available'
+
+** setting src on video that does not have event listener
+
+EVENT: 'webkitplaybacktargetavailabilitychanged', event.availability = 'available'
+
+END OF TEST
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsmediaairplaytargetavailabilityhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/media/airplay-target-availability.html (0 => 195068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/media/airplay-target-availability.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/media/airplay-target-availability.html 2016-01-14 19:19:34 UTC (rev 195068)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+<html>
+ <head>
+ <script src="media-file.js"></script>
+ <script src="video-test.js"></script>
+ <script>
+ var video1;
+ var video2;
+
+ function start()
+ {
+ video1 = document.getElementsByTagName('video')[0];
+ video2 = document.getElementsByTagName('video')[1];
+
+ if (window.internals)
+ internals.setMockMediaPlaybackTargetPickerEnabled(true);
+
+ video1.addEventListener('webkitplaybacktargetavailabilitychanged', targetAvailabilityChanged);
+ setTimeout(setSource, 200);
+ }
+
+ function targetAvailabilityChanged(event)
+ {
+ consoleWrite(`<br>EVENT: '${event.type}', event.availability = '${event.availability}'<br>`);
+
+ if (event.availability != "available")
+ return;
+
+ if (event.availability == "available" && video2.src == "") {
+ failTest("Event sent before any video is a candidate for airplay");
+ return;
+ }
+
+ endTest();
+ }
+
+ function setSource()
+ {
+ consoleWrite('** setting src on video that does not have event listener');
+ if (window.internals)
+ internals.setMockMediaPlaybackTargetPickerState("Sleepy TV", "DeviceAvailable");
+ video2.src = findMediaFile('video', 'content/test');
+ }
+
+ </script>
+ </head>
+
+ <body onload="start()">
+ <video controls></video>
+ <br>
+ <video controls></video>
+ <p>Test that 'webkitplaybacktargetavailabilitychanged' event is sent when at least one
+ video element has playable media.</p>
+ </body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsplatformeflTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/platform/efl/TestExpectations (195067 => 195068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/platform/efl/TestExpectations 2016-01-14 19:19:28 UTC (rev 195067)
+++ branches/safari-601-branch/LayoutTests/platform/efl/TestExpectations 2016-01-14 19:19:34 UTC (rev 195068)
</span><span class="lines">@@ -2301,3 +2301,6 @@
</span><span class="cx">
</span><span class="cx"> # This test uses an MPEG-4 video
</span><span class="cx"> media/video-seek-to-current-time.html [ Skip ]
</span><ins>+
+# WIRELESS_PLAYBACK_TARGET not enabled.
+media/airplay-target-availability.html
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/platform/gtk/TestExpectations (195067 => 195068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/platform/gtk/TestExpectations 2016-01-14 19:19:28 UTC (rev 195067)
+++ branches/safari-601-branch/LayoutTests/platform/gtk/TestExpectations 2016-01-14 19:19:34 UTC (rev 195068)
</span><span class="lines">@@ -2403,3 +2403,6 @@
</span><span class="cx">
</span><span class="cx"> # This test uses an MPEG-4 video
</span><span class="cx"> media/video-seek-to-current-time.html [ Skip ]
</span><ins>+
+# WIRELESS_PLAYBACK_TARGET not enabled.
+media/airplay-target-availability.html
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/platform/mac/TestExpectations (195067 => 195068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/platform/mac/TestExpectations 2016-01-14 19:19:28 UTC (rev 195067)
+++ branches/safari-601-branch/LayoutTests/platform/mac/TestExpectations 2016-01-14 19:19:34 UTC (rev 195068)
</span><span class="lines">@@ -1381,3 +1381,6 @@
</span><span class="cx"> # Yosemite and El Capitan do not support font feature coverage queries.
</span><span class="cx"> [ Yosemite ElCapitan ] css3/font-variant-small-caps-synthesis-coverage.html [ ImageOnlyFailure ]
</span><span class="cx"> [ Yosemite ElCapitan ] css3/font-variant-petite-caps-synthesis-coverage.html [ ImageOnlyFailure ]
</span><ins>+
+# WIRELESS_PLAYBACK_TARGET not enabled on Yosemite.
+[ Yosemite ] media/airplay-target-availability.html
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/platform/win/TestExpectations (195067 => 195068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/platform/win/TestExpectations 2016-01-14 19:19:28 UTC (rev 195067)
+++ branches/safari-601-branch/LayoutTests/platform/win/TestExpectations 2016-01-14 19:19:34 UTC (rev 195068)
</span><span class="lines">@@ -3140,3 +3140,6 @@
</span><span class="cx">
</span><span class="cx"> # This test uses an MPEG-4 video
</span><span class="cx"> media/video-seek-to-current-time.html [ Skip ]
</span><ins>+
+# WIRELESS_PLAYBACK_TARGET not enabled.
+media/airplay-target-availability.html
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (195067 => 195068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-14 19:19:28 UTC (rev 195067)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-14 19:19:34 UTC (rev 195068)
</span><span class="lines">@@ -1,5 +1,44 @@
</span><span class="cx"> 2016-01-14 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r194672. rdar://problem/24154288
+
+ 2016-01-06 Eric Carlson <eric.carlson@apple.com>
+
+ AirPlay route availability event not always sent
+ https://bugs.webkit.org/show_bug.cgi?id=152802
+
+ Reviewed by Jer Noble.
+
+ Test: media/airplay-target-availability.html
+
+ * Modules/mediasession/WebMediaSessionManager.cpp:
+ (WebCore::mediaProducerStateString): Log the new flags.
+ (WebCore::WebMediaSessionManager::clientStateDidChange): Schedule a client reconfiguration if
+ the 'requires monitoring', 'has listener', or 'has audio or video' flags have changed.
+ (WebCore::WebMediaSessionManager::configurePlaybackTargetMonitoring): Start monitoring if
+ at least one client has a listener and at least one has audio/video.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::mediaState): Set new flags.
+ * html/HTMLMediaElement.h:
+
+ * page/MediaProducer.h: Define new flags. Add new state enum.
+
+ * platform/graphics/MediaPlaybackTargetContext.h: Initial state is "Unknown".
+
+ * platform/mock/MediaPlaybackTargetMock.h:
+ * platform/mock/MediaPlaybackTargetPickerMock.cpp:
+ (WebCore::MediaPlaybackTargetPickerMock::externalOutputDeviceAvailable): Enums not bitfields.
+ (WebCore::MediaPlaybackTargetPickerMock::startingMonitoringPlaybackTargets): Ditto. Don't make
+ device change callback if the device state is "Unknown".
+ (WebCore::MediaPlaybackTargetPickerMock::setState): Ditto.
+ * platform/mock/MediaPlaybackTargetPickerMock.h:
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::setMockMediaPlaybackTargetPickerState): Support new state.
+
+2016-01-14 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r192200. rdar://problem/24154288
</span><span class="cx">
</span><span class="cx"> 2015-11-09 Eric Carlson <eric.carlson@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreModulesmediasessionWebMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp (195067 => 195068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2016-01-14 19:19:28 UTC (rev 195067)
+++ branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2016-01-14 19:19:34 UTC (rev 195068)
</span><span class="lines">@@ -74,12 +74,16 @@
</span><span class="cx"> string.append("IsPlayingVideo + ");
</span><span class="cx"> if (flags & MediaProducer::IsPlayingToExternalDevice)
</span><span class="cx"> string.append("IsPlayingToExternalDevice + ");
</span><ins>+ if (flags & MediaProducer::HasPlaybackTargetAvailabilityListener)
+ string.append("HasPlaybackTargetAvailabilityListener + ");
</ins><span class="cx"> if (flags & MediaProducer::RequiresPlaybackTargetMonitoring)
</span><span class="cx"> string.append("RequiresPlaybackTargetMonitoring + ");
</span><span class="cx"> if (flags & MediaProducer::ExternalDeviceAutoPlayCandidate)
</span><span class="cx"> string.append("ExternalDeviceAutoPlayCandidate + ");
</span><span class="cx"> if (flags & MediaProducer::DidPlayToEnd)
</span><span class="cx"> string.append("DidPlayToEnd + ");
</span><ins>+ if (flags & MediaProducer::HasAudioOrVideo)
+ string.append("HasAudioOrVideo + ");
</ins><span class="cx"> if (string.isEmpty())
</span><span class="cx"> string.append("IsNotPlaying");
</span><span class="cx"> else
</span><span class="lines">@@ -209,7 +213,9 @@
</span><span class="cx"> LOG(Media, "WebMediaSessionManager::clientStateDidChange(%p + %llu) - new flags = %s, old flags = %s", &client, contextId, mediaProducerStateString(newFlags).utf8().data(), mediaProducerStateString(oldFlags).utf8().data());
</span><span class="cx">
</span><span class="cx"> changedClientState->flags = newFlags;
</span><del>- if (!flagsAreSet(oldFlags, MediaProducer::RequiresPlaybackTargetMonitoring) && flagsAreSet(newFlags, MediaProducer::RequiresPlaybackTargetMonitoring))
</del><ins>+
+ MediaProducer::MediaStateFlags updateConfigurationFlags = MediaProducer::RequiresPlaybackTargetMonitoring | MediaProducer::HasPlaybackTargetAvailabilityListener | MediaProducer::HasAudioOrVideo;
+ if (!flagsAreSet(oldFlags, updateConfigurationFlags) && flagsAreSet(newFlags, 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">@@ -231,7 +237,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Do not take begin playing to the device unless playback has just started.
</del><ins>+ // Do not begin playing to the device unless playback has just started.
</ins><span class="cx"> if (!flagsAreSet(newFlags, MediaProducer::IsPlayingVideo) || flagsAreSet(oldFlags, MediaProducer::IsPlayingVideo))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -339,16 +345,22 @@
</span><span class="cx"> void WebMediaSessionManager::configurePlaybackTargetMonitoring()
</span><span class="cx"> {
</span><span class="cx"> bool monitoringRequired = false;
</span><ins>+ bool hasAvailabilityListener = false;
+ bool haveClientWithMedia = false;
</ins><span class="cx"> for (auto& state : m_clientState) {
</span><span class="cx"> if (state->flags & MediaProducer::RequiresPlaybackTargetMonitoring) {
</span><span class="cx"> monitoringRequired = true;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+ if (state->flags & MediaProducer::HasPlaybackTargetAvailabilityListener)
+ hasAvailabilityListener = true;
+ if (state->flags & MediaProducer::HasAudioOrVideo)
+ haveClientWithMedia = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LOG(Media, "WebMediaSessionManager::configurePlaybackTargetMonitoring - monitoringRequired = %i", (int)monitoringRequired);
</span><span class="cx">
</span><del>- if (monitoringRequired)
</del><ins>+ if (monitoringRequired || (hasAvailabilityListener && haveClientWithMedia))
</ins><span class="cx"> targetPicker().startingMonitoringPlaybackTargets();
</span><span class="cx"> else
</span><span class="cx"> targetPicker().stopMonitoringPlaybackTargets();
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/HTMLMediaElement.cpp (195067 => 195068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/HTMLMediaElement.cpp 2016-01-14 19:19:28 UTC (rev 195067)
+++ branches/safari-601-branch/Source/WebCore/html/HTMLMediaElement.cpp 2016-01-14 19:19:34 UTC (rev 195068)
</span><span class="lines">@@ -6434,7 +6434,6 @@
</span><span class="cx">
</span><span class="cx"> MediaProducer::MediaStateFlags HTMLMediaElement::mediaState() const
</span><span class="cx"> {
</span><del>-
</del><span class="cx"> MediaStateFlags state = IsNotPlaying;
</span><span class="cx">
</span><span class="cx"> bool hasActiveVideo = isVideo() && hasVideo();
</span><span class="lines">@@ -6443,13 +6442,19 @@
</span><span class="cx"> if (m_player && m_player->isCurrentPlaybackTargetWireless())
</span><span class="cx"> state |= IsPlayingToExternalDevice;
</span><span class="cx">
</span><del>- if (m_player && m_hasPlaybackTargetAvailabilityListeners && !m_mediaSession->wirelessVideoPlaybackDisabled(*this))
- state |= RequiresPlaybackTargetMonitoring;
</del><ins>+ if (m_hasPlaybackTargetAvailabilityListeners) {
+ state |= HasPlaybackTargetAvailabilityListener;
+ if (!m_mediaSession->wirelessVideoPlaybackDisabled(*this))
+ state |= RequiresPlaybackTargetMonitoring;
+ }
</ins><span class="cx">
</span><span class="cx"> bool requireUserGesture = m_mediaSession->hasBehaviorRestriction(MediaElementSession::RequireUserGestureToAutoplayToExternalDevice);
</span><span class="cx"> if (m_readyState >= HAVE_METADATA && !requireUserGesture && !m_failedToPlayToWirelessTarget)
</span><span class="cx"> state |= ExternalDeviceAutoPlayCandidate;
</span><span class="cx">
</span><ins>+ if (hasActiveVideo || hasAudio)
+ state |= HasAudioOrVideo;
+
</ins><span class="cx"> if (hasActiveVideo && endedPlayback())
</span><span class="cx"> state |= DidPlayToEnd;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/HTMLMediaElement.h (195067 => 195068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/HTMLMediaElement.h 2016-01-14 19:19:28 UTC (rev 195067)
+++ branches/safari-601-branch/Source/WebCore/html/HTMLMediaElement.h 2016-01-14 19:19:34 UTC (rev 195068)
</span><span class="lines">@@ -745,6 +745,7 @@
</span><span class="cx"> Synchronously,
</span><span class="cx"> };
</span><span class="cx"> void updateMediaState(UpdateMediaState updateState = UpdateMediaState::Synchronously);
</span><ins>+ bool hasPlaybackTargetAvailabilityListeners() const { return m_hasPlaybackTargetAvailabilityListeners; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> Timer m_pendingActionTimer;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorepageMediaProducerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/page/MediaProducer.h (195067 => 195068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/page/MediaProducer.h 2016-01-14 19:19:28 UTC (rev 195067)
+++ branches/safari-601-branch/Source/WebCore/page/MediaProducer.h 2016-01-14 19:19:34 UTC (rev 195068)
</span><span class="lines">@@ -38,6 +38,8 @@
</span><span class="cx"> RequiresPlaybackTargetMonitoring = 1 << 3,
</span><span class="cx"> ExternalDeviceAutoPlayCandidate = 1 << 4,
</span><span class="cx"> DidPlayToEnd = 1 << 5,
</span><ins>+ HasPlaybackTargetAvailabilityListener = 1 << 9,
+ HasAudioOrVideo = 1 << 10,
</ins><span class="cx"> };
</span><span class="cx"> typedef unsigned MediaStateFlags;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsMediaPlaybackTargetContexth"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/MediaPlaybackTargetContext.h (195067 => 195068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/MediaPlaybackTargetContext.h 2016-01-14 19:19:28 UTC (rev 195067)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/MediaPlaybackTargetContext.h 2016-01-14 19:19:34 UTC (rev 195068)
</span><span class="lines">@@ -48,8 +48,9 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum ContextState {
</span><del>- Unavailable = 0,
- OutputDeviceAvailable = 1 << 0,
</del><ins>+ Unknown = 0,
+ OutputDeviceUnavailable = 1,
+ OutputDeviceAvailable = 2,
</ins><span class="cx"> };
</span><span class="cx"> typedef unsigned State;
</span><span class="cx">
</span><span class="lines">@@ -97,7 +98,7 @@
</span><span class="cx"> Type m_type { None };
</span><span class="cx"> AVOutputContext *m_outputContext { nullptr };
</span><span class="cx"> String m_name;
</span><del>- State m_state { Unavailable };
</del><ins>+ State m_state { Unknown };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformmockMediaPlaybackTargetMockh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetMock.h (195067 => 195068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetMock.h 2016-01-14 19:19:28 UTC (rev 195067)
+++ branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetMock.h 2016-01-14 19:19:34 UTC (rev 195068)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> MediaPlaybackTargetMock(const String&, MediaPlaybackTargetContext::State);
</span><span class="cx">
</span><span class="cx"> String m_name;
</span><del>- MediaPlaybackTargetContext::State m_state { MediaPlaybackTargetContext::Unavailable };
</del><ins>+ MediaPlaybackTargetContext::State m_state { MediaPlaybackTargetContext::Unknown };
</ins><span class="cx"> mutable MediaPlaybackTargetContext m_context;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformmockMediaPlaybackTargetPickerMockcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp (195067 => 195068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp 2016-01-14 19:19:28 UTC (rev 195067)
+++ branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp 2016-01-14 19:19:34 UTC (rev 195068)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> bool MediaPlaybackTargetPickerMock::externalOutputDeviceAvailable()
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlaybackTargetPickerMock::externalOutputDeviceAvailable");
</span><del>- return m_state & MediaPlaybackTargetContext::OutputDeviceAvailable;
</del><ins>+ return m_state == MediaPlaybackTargetContext::OutputDeviceAvailable;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<MediaPlaybackTarget> MediaPlaybackTargetPickerMock::playbackTarget()
</span><span class="lines">@@ -90,10 +90,10 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlaybackTargetPickerMock::startingMonitoringPlaybackTargets");
</span><span class="cx">
</span><del>- if (m_state & MediaPlaybackTargetContext::OutputDeviceAvailable)
</del><ins>+ if (m_state == MediaPlaybackTargetContext::OutputDeviceAvailable)
</ins><span class="cx"> availableDevicesDidChange();
</span><span class="cx">
</span><del>- if (!m_deviceName.isEmpty())
</del><ins>+ if (!m_deviceName.isEmpty() && m_state != MediaPlaybackTargetContext::Unknown)
</ins><span class="cx"> currentDeviceDidChange();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -105,14 +105,14 @@
</span><span class="cx"> void MediaPlaybackTargetPickerMock::invalidatePlaybackTargets()
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlaybackTargetPickerMock::invalidatePlaybackTargets");
</span><del>- setState(WTF::emptyString(), MediaPlaybackTargetContext::Unavailable);
</del><ins>+ setState(emptyString(), MediaPlaybackTargetContext::Unknown);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlaybackTargetPickerMock::setState(const String& deviceName, MediaPlaybackTargetContext::State state)
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlaybackTargetPickerMock::setState - name = %s, state = 0x%x", deviceName.utf8().data(), (unsigned)state);
</span><span class="cx">
</span><del>- if (deviceName != m_deviceName) {
</del><ins>+ if (deviceName != m_deviceName && state != MediaPlaybackTargetContext::Unknown) {
</ins><span class="cx"> m_deviceName = deviceName;
</span><span class="cx"> currentDeviceDidChange();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformmockMediaPlaybackTargetPickerMockh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h (195067 => 195068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h 2016-01-14 19:19:28 UTC (rev 195067)
+++ branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h 2016-01-14 19:19:34 UTC (rev 195068)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> String m_deviceName;
</span><span class="cx"> RunLoop::Timer<MediaPlaybackTargetPickerMock> m_timer;
</span><del>- MediaPlaybackTargetContext::State m_state { MediaPlaybackTargetContext::Unavailable };
</del><ins>+ MediaPlaybackTargetContext::State m_state { MediaPlaybackTargetContext::Unknown };
</ins><span class="cx"> bool m_showingMenu { false };
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/testing/Internals.cpp (195067 => 195068)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/testing/Internals.cpp 2016-01-14 19:19:28 UTC (rev 195067)
+++ branches/safari-601-branch/Source/WebCore/testing/Internals.cpp 2016-01-14 19:19:34 UTC (rev 195068)
</span><span class="lines">@@ -2818,10 +2818,14 @@
</span><span class="cx"> Page* page = contextDocument()->frame()->page();
</span><span class="cx"> ASSERT(page);
</span><span class="cx">
</span><del>- MediaPlaybackTargetContext::State state = MediaPlaybackTargetContext::Unavailable;
</del><ins>+ MediaPlaybackTargetContext::State state = MediaPlaybackTargetContext::Unknown;
</ins><span class="cx">
</span><span class="cx"> if (equalIgnoringCase(deviceState, "DeviceAvailable"))
</span><span class="cx"> state = MediaPlaybackTargetContext::OutputDeviceAvailable;
</span><ins>+ else if (equalIgnoringCase(deviceState, "DeviceUnavailable"))
+ state = MediaPlaybackTargetContext::OutputDeviceUnavailable;
+ else if (equalIgnoringCase(deviceState, "Unknown"))
+ state = MediaPlaybackTargetContext::Unknown;
</ins><span class="cx"> else {
</span><span class="cx"> ec = INVALID_ACCESS_ERR;
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>