<!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>[186854] 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/186854">186854</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-07-15 13:49:48 -0700 (Wed, 15 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] AirPlay route is not always set automatically
https://bugs.webkit.org/show_bug.cgi?id=146969
Reviewed by Jer Noble.
* Modules/mediasession/WebMediaSessionManager.cpp:
(WebCore::WebMediaSessionManager::configurePlaybackTargetClients): Return early if there are
no clients. Make the first client in the vector automatically play to the target if there
is no other match and there is an active route.
(WebCore::WebMediaSessionManager::watchdogTimerFired): Call picker.invalidatePlaybackTargets,
not stopMonitoringPlaybackTargets.
* platform/graphics/MediaPlaybackTargetPicker.cpp:
(WebCore::MediaPlaybackTargetPicker::invalidatePlaybackTargets): New.
* platform/graphics/MediaPlaybackTargetPicker.h:
* platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h:
* platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
(WebCore::MediaPlaybackTargetPickerMac::stopMonitoringPlaybackTargets): Do nothing, AirPlay
automatically stops monitoring when appropriate and release the picker also releases
the output context, which drops the route.
(WebCore::MediaPlaybackTargetPickerMac::invalidatePlaybackTargets): New.</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="#trunkSourceWebCoreplatformgraphicsMediaPlaybackTargetPickercpp">trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlaybackTargetPickerh">trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlaybackTargetPickerMach">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlaybackTargetPickerMacmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186853 => 186854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-15 20:36:01 UTC (rev 186853)
+++ trunk/Source/WebCore/ChangeLog 2015-07-15 20:49:48 UTC (rev 186854)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-07-15 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] AirPlay route is not always set automatically
+ https://bugs.webkit.org/show_bug.cgi?id=146969
+
+ Reviewed by Jer Noble.
+
+ * Modules/mediasession/WebMediaSessionManager.cpp:
+ (WebCore::WebMediaSessionManager::configurePlaybackTargetClients): Return early if there are
+ no clients. Make the first client in the vector automatically play to the target if there
+ is no other match and there is an active route.
+ (WebCore::WebMediaSessionManager::watchdogTimerFired): Call picker.invalidatePlaybackTargets,
+ not stopMonitoringPlaybackTargets.
+
+ * platform/graphics/MediaPlaybackTargetPicker.cpp:
+ (WebCore::MediaPlaybackTargetPicker::invalidatePlaybackTargets): New.
+ * platform/graphics/MediaPlaybackTargetPicker.h:
+
+ * platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h:
+ * platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
+ (WebCore::MediaPlaybackTargetPickerMac::stopMonitoringPlaybackTargets): Do nothing, AirPlay
+ automatically stops monitoring when appropriate and release the picker also releases
+ the output context, which drops the route.
+ (WebCore::MediaPlaybackTargetPickerMac::invalidatePlaybackTargets): New.
+
</ins><span class="cx"> 2015-07-15 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove forwarding headers that no longer point to valid headers
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionWebMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp (186853 => 186854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2015-07-15 20:36:01 UTC (rev 186853)
+++ trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2015-07-15 20:49:48 UTC (rev 186854)
</span><span class="lines">@@ -245,6 +245,9 @@
</span><span class="cx">
</span><span class="cx"> void WebMediaSessionManager::configurePlaybackTargetClients()
</span><span class="cx"> {
</span><ins>+ if (m_clientState.isEmpty())
+ return;
+
</ins><span class="cx"> size_t indexOfClientThatRequestedPicker = notFound;
</span><span class="cx"> size_t indexOfLastClientToRequestPicker = notFound;
</span><span class="cx"> size_t indexOfClientWillPlayToTarget = notFound;
</span><span class="lines">@@ -269,6 +272,8 @@
</span><span class="cx"> indexOfClientWillPlayToTarget = indexOfClientThatRequestedPicker;
</span><span class="cx"> if (indexOfClientWillPlayToTarget == notFound && indexOfLastClientToRequestPicker != notFound)
</span><span class="cx"> indexOfClientWillPlayToTarget = indexOfLastClientToRequestPicker;
</span><ins>+ if (indexOfClientWillPlayToTarget == notFound && haveActiveRoute)
+ indexOfClientWillPlayToTarget = 0;
</ins><span class="cx">
</span><span class="cx"> LOG(Media, "WebMediaSessionManager::configurePlaybackTargetClients - indexOfClientWillPlayToTarget = %zu", indexOfClientWillPlayToTarget);
</span><span class="cx">
</span><span class="lines">@@ -288,7 +293,6 @@
</span><span class="cx">
</span><span class="cx"> if (haveActiveRoute && indexOfClientWillPlayToTarget != notFound) {
</span><span class="cx"> auto& state = m_clientState[indexOfClientWillPlayToTarget];
</span><del>-
</del><span class="cx"> if (!flagsAreSet(state->flags, MediaProducer::IsPlayingToExternalDevice))
</span><span class="cx"> state->client.setShouldPlayToPlaybackTarget(state->contextId, true);
</span><span class="cx"> }
</span><span class="lines">@@ -410,7 +414,7 @@
</span><span class="cx"> if (!m_playbackTarget)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- targetPicker().stopMonitoringPlaybackTargets();
</del><ins>+ targetPicker().invalidatePlaybackTargets();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlaybackTargetPickercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.cpp (186853 => 186854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.cpp 2015-07-15 20:36:01 UTC (rev 186853)
+++ trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.cpp 2015-07-15 20:49:48 UTC (rev 186854)
</span><span class="lines">@@ -55,6 +55,11 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaPlaybackTargetPicker::invalidatePlaybackTargets()
+{
+ ASSERT_NOT_REACHED();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WIRELESS_PLAYBACK_TARGET)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlaybackTargetPickerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h (186853 => 186854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h 2015-07-15 20:36:01 UTC (rev 186853)
+++ trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h 2015-07-15 20:49:48 UTC (rev 186854)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> virtual void showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute);
</span><span class="cx"> virtual void startingMonitoringPlaybackTargets();
</span><span class="cx"> virtual void stopMonitoringPlaybackTargets();
</span><ins>+ virtual void invalidatePlaybackTargets();
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> explicit MediaPlaybackTargetPicker(Client&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlaybackTargetPickerMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h (186853 => 186854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h 2015-07-15 20:36:01 UTC (rev 186853)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h 2015-07-15 20:49:48 UTC (rev 186854)
</span><span class="lines">@@ -44,10 +44,11 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT static std::unique_ptr<MediaPlaybackTargetPickerMac> create(MediaPlaybackTargetPicker::Client&);
</span><span class="cx">
</span><del>- virtual void showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute) override;
- virtual void startingMonitoringPlaybackTargets() override;
- virtual void stopMonitoringPlaybackTargets() override;
-
</del><ins>+ void showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute) override;
+ void startingMonitoringPlaybackTargets() override;
+ void stopMonitoringPlaybackTargets() override;
+ void invalidatePlaybackTargets() override;
+
</ins><span class="cx"> void availableDevicesDidChange();
</span><span class="cx"> void currentDeviceDidChange();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlaybackTargetPickerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm (186853 => 186854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2015-07-15 20:36:01 UTC (rev 186853)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2015-07-15 20:49:48 UTC (rev 186854)
</span><span class="lines">@@ -188,7 +188,13 @@
</span><span class="cx"> void MediaPlaybackTargetPickerMac::stopMonitoringPlaybackTargets()
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlaybackTargetPickerMac::stopMonitoringPlaybackTargets");
</span><ins>+ // Nothing to do, AirPlay takes care of this automatically.
+}
</ins><span class="cx">
</span><ins>+void MediaPlaybackTargetPickerMac::invalidatePlaybackTargets()
+{
+ LOG(Media, "MediaPlaybackTargetPickerMac::invalidatePlaybackTargets");
+
</ins><span class="cx"> if (m_outputDeviceMenuController) {
</span><span class="cx"> [m_outputDeviceMenuController removeObserver:m_outputDeviceMenuControllerDelegate.get() forKeyPath:externalOutputDeviceAvailableKeyName];
</span><span class="cx"> [m_outputDeviceMenuController removeObserver:m_outputDeviceMenuControllerDelegate.get() forKeyPath:externalOutputDevicePickedKeyName];
</span></span></pre>
</div>
</div>
</body>
</html>