<!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>[186519] trunk/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/186519">186519</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-07-08 11:54:34 -0700 (Wed, 08 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Two clicks required to enable AirPlay at youtube.com
https://bugs.webkit.org/show_bug.cgi?id=146733
<rdar://problem/21556356>
Reviewed by Brent Fulgham.
* Modules/mediasession/WebMediaSessionManager.cpp:
(WebCore::WebMediaSessionManager::clientStateDidChange): Only log when state has changed.
Don't steal the route if another client is actively playing to the device.
(WebCore::WebMediaSessionManager::setPlaybackTarget): Set m_targetChanged.
(WebCore::WebMediaSessionManager::configurePlaybackTargetClients): Don't consider the
requestedPicker flag until after a target change.
* Modules/mediasession/WebMediaSessionManager.h:
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::webkitShowPlaybackTargetPicker): Add logging.
(WebCore::HTMLMediaElement::setShouldPlayToPlaybackTarget): Ditto.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget): Always log.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionWebMediaSessionManagercpp">trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionWebMediaSessionManagerh">trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186518 => 186519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-08 18:52:31 UTC (rev 186518)
+++ trunk/Source/WebCore/ChangeLog 2015-07-08 18:54:34 UTC (rev 186519)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-07-08 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] Two clicks required to enable AirPlay at youtube.com
+ https://bugs.webkit.org/show_bug.cgi?id=146733
+ <rdar://problem/21556356>
+
+ Reviewed by Brent Fulgham.
+
+ * Modules/mediasession/WebMediaSessionManager.cpp:
+ (WebCore::WebMediaSessionManager::clientStateDidChange): Only log when state has changed.
+ Don't steal the route if another client is actively playing to the device.
+ (WebCore::WebMediaSessionManager::setPlaybackTarget): Set m_targetChanged.
+ (WebCore::WebMediaSessionManager::configurePlaybackTargetClients): Don't consider the
+ requestedPicker flag until after a target change.
+ * Modules/mediasession/WebMediaSessionManager.h:
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::webkitShowPlaybackTargetPicker): Add logging.
+ (WebCore::HTMLMediaElement::setShouldPlayToPlaybackTarget): Ditto.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget): Always log.
+
</ins><span class="cx"> 2015-07-08 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Do not waste window server memory for placeholder windows initiated by ThemeMac.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionWebMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp (186518 => 186519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2015-07-08 18:52:31 UTC (rev 186518)
+++ trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2015-07-08 18:54:34 UTC (rev 186519)
</span><span class="lines">@@ -165,10 +165,11 @@
</span><span class="cx">
</span><span class="cx"> auto& changedClientState = m_clientState[index];
</span><span class="cx"> MediaProducer::MediaStateFlags oldFlags = changedClientState->flags;
</span><del>- LOG(Media, "WebMediaSessionManager::clientStateDidChange(%p + %llu) - new flags = %s, old flags = %s", &client, contextId, mediaProducerStateString(newFlags).utf8().data(), mediaProducerStateString(oldFlags).utf8().data());
</del><span class="cx"> if (newFlags == oldFlags)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ LOG(Media, "WebMediaSessionManager::clientStateDidChange(%p + %llu) - new flags = %s, old flags = %s", &client, contextId, mediaProducerStateString(newFlags).utf8().data(), mediaProducerStateString(oldFlags).utf8().data());
+
</ins><span class="cx"> changedClientState->flags = newFlags;
</span><span class="cx"> if (!flagsAreSet(oldFlags, MediaProducer::RequiresPlaybackTargetMonitoring) && flagsAreSet(newFlags, MediaProducer::RequiresPlaybackTargetMonitoring))
</span><span class="cx"> scheduleDelayedTask(TargetMonitoringConfigurationTask);
</span><span class="lines">@@ -199,8 +200,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Do not take the target if another client has it and the client reporting a state change is not playing.
- if (anotherClientHasActiveTarget && !flagsAreSet(newFlags, MediaProducer::IsPlayingVideo))
</del><ins>+ if (anotherClientHasActiveTarget || !flagsAreSet(newFlags, MediaProducer::IsPlayingVideo))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (auto& state : m_clientState) {
</span><span class="lines">@@ -218,6 +218,7 @@
</span><span class="cx"> void WebMediaSessionManager::setPlaybackTarget(Ref<MediaPlaybackTarget>&& target)
</span><span class="cx"> {
</span><span class="cx"> m_playbackTarget = WTF::move(target);
</span><ins>+ m_targetChanged = true;
</ins><span class="cx"> scheduleDelayedTask(TargetClientsConfigurationTask);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -255,7 +256,7 @@
</span><span class="cx"> for (size_t i = 0; i < m_clientState.size(); ++i) {
</span><span class="cx"> auto& state = m_clientState[i];
</span><span class="cx">
</span><del>- if (state->requestedPicker)
</del><ins>+ if (m_targetChanged && state->requestedPicker)
</ins><span class="cx"> indexOfClientThatRequestedPicker = i;
</span><span class="cx">
</span><span class="cx"> if (indexOfClientWillPlayToTarget == notFound && flagsAreSet(state->flags, MediaProducer::IsPlayingToExternalDevice))
</span><span class="lines">@@ -277,7 +278,8 @@
</span><span class="cx"> state->client.setShouldPlayToPlaybackTarget(state->contextId, false);
</span><span class="cx">
</span><span class="cx"> state->configurationRequired = false;
</span><del>- state->requestedPicker = false;
</del><ins>+ if (m_targetChanged)
+ state->requestedPicker = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (haveActiveRoute && indexOfClientWillPlayToTarget != notFound) {
</span><span class="lines">@@ -286,6 +288,7 @@
</span><span class="cx"> state->client.setShouldPlayToPlaybackTarget(state->contextId, true);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ m_targetChanged = false;
</ins><span class="cx"> configureWatchdogTimer();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionWebMediaSessionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h (186518 => 186519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h 2015-07-08 18:52:31 UTC (rev 186518)
+++ trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h 2015-07-08 18:54:34 UTC (rev 186519)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> virtual void externalOutputDeviceAvailableDidChange(bool) override;
</span><span class="cx">
</span><span class="cx"> size_t find(WebMediaSessionManagerClient*, uint64_t);
</span><ins>+
</ins><span class="cx"> void configurePlaybackTargetClients();
</span><span class="cx"> void configureNewClients();
</span><span class="cx"> void configurePlaybackTargetMonitoring();
</span><span class="lines">@@ -92,6 +93,7 @@
</span><span class="cx"> ConfigurationTasks m_taskFlags { NoTask };
</span><span class="cx"> double m_currentWatchdogInterval { 0 };
</span><span class="cx"> bool m_externalOutputDeviceAvailable { false };
</span><ins>+ bool m_targetChanged { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (186518 => 186519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-07-08 18:52:31 UTC (rev 186518)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-07-08 18:54:34 UTC (rev 186519)
</span><span class="lines">@@ -4980,6 +4980,7 @@
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> void HTMLMediaElement::webkitShowPlaybackTargetPicker()
</span><span class="cx"> {
</span><ins>+ LOG(Media, "HTMLMediaElement::webkitShowPlaybackTargetPicker(%p)", this);
</ins><span class="cx"> m_mediaSession->showPlaybackTargetPicker(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5086,6 +5087,8 @@
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::setShouldPlayToPlaybackTarget(bool shouldPlay)
</span><span class="cx"> {
</span><ins>+ LOG(Media, "HTMLMediaElement::setShouldPlayToPlaybackTarget(%p) - shouldPlay = %s", this, boolString(shouldPlay));
+
</ins><span class="cx"> if (m_player)
</span><span class="cx"> m_player->setShouldPlayToPlaybackTarget(shouldPlay);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (186518 => 186519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-07-08 18:52:31 UTC (rev 186518)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-07-08 18:54:34 UTC (rev 186519)
</span><span class="lines">@@ -2822,14 +2822,13 @@
</span><span class="cx"> {
</span><span class="cx"> m_shouldPlayToPlaybackTarget = shouldPlay;
</span><span class="cx">
</span><ins>+ AVOutputContext *newContext = shouldPlay ? m_outputContext.get() : nil;
+ LOG(Media, "MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget(%p) - target = %p, shouldPlay = %s", this, newContext, boolString(shouldPlay));
+
</ins><span class="cx"> if (!m_avPlayer)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- AVOutputContext *newContext = shouldPlay ? m_outputContext.get() : nil;
</del><span class="cx"> RetainPtr<AVOutputContext> currentContext = m_avPlayer.get().outputContext;
</span><del>-
- LOG(Media, "MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget(%p) - target = %p, shouldPlay = %s", this, newContext, boolString(shouldPlay));
-
</del><span class="cx"> if ((!newContext && !currentContext.get()) || [currentContext.get() isEqual:newContext])
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>