<!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>[195738] branches/safari-601-branch/Source/WebCore</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/195738">195738</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-28 08:26:25 -0800 (Thu, 28 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/195592">r195592</a> and parts of <a href="http://trac.webkit.org/projects/webkit/changeset/194672">r194672</a> to fix rdar://24154288</pre>
<h3>Modified Paths</h3>
<ul>
<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="#branchessafari601branchSourceWebCorepageMediaProducerh">branches/safari-601-branch/Source/WebCore/page/MediaProducer.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (195737 => 195738)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-28 16:18:32 UTC (rev 195737)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-28 16:26:25 UTC (rev 195738)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-01-26 Eric Carlson <eric.carlson@apple.com>
+
+ Cherry-pick r195592 and parts of r194672 to fix rdar://24154288
+ <rdar://problem/24154288> FaradayDotFour: Do not see AirPlay icon in Vimeo
+
+ Unreviewed.
+
+ * Modules/mediasession/WebMediaSessionManager.cpp:
+ (WebCore::mediaProducerStateString): Log a new flag.
+ (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.
+
+ * page/MediaProducer.h: Add new flags.
+
</ins><span class="cx"> 2016-01-27 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r195609. rdar://problem/24337868
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreModulesmediasessionWebMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp (195737 => 195738)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2016-01-28 16:18:32 UTC (rev 195737)
+++ branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2016-01-28 16:26:25 UTC (rev 195738)
</span><span class="lines">@@ -74,6 +74,8 @@
</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="lines">@@ -174,7 +176,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 ((oldFlags & updateConfigurationFlags) != (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">@@ -196,7 +200,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">@@ -304,16 +308,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><del>- LOG(Media, "WebMediaSessionManager::configurePlaybackTargetMonitoring - monitoringRequired = %i", (int)monitoringRequired);
</del><ins>+ LOG(Media, "WebMediaSessionManager::configurePlaybackTargetMonitoring - monitoringRequired = %i", static_cast<int>(monitoringRequired || (hasAvailabilityListener && haveClientWithMedia)));
</ins><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 (195737 => 195738)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/HTMLMediaElement.cpp 2016-01-28 16:18:32 UTC (rev 195737)
+++ branches/safari-601-branch/Source/WebCore/html/HTMLMediaElement.cpp 2016-01-28 16:26:25 UTC (rev 195738)
</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="branchessafari601branchSourceWebCorepageMediaProducerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/page/MediaProducer.h (195737 => 195738)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/page/MediaProducer.h 2016-01-28 16:18:32 UTC (rev 195737)
+++ branches/safari-601-branch/Source/WebCore/page/MediaProducer.h 2016-01-28 16:26:25 UTC (rev 195738)
</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>
</div>
</body>
</html>