<!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>[186361] 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/186361">186361</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-07-06 11:04:10 -0700 (Mon, 06 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Inactive AirPlay route should automatically timeout
https://bugs.webkit.org/show_bug.cgi?id=146642
<rdar://problem/21602955>
Automatically clear a media element's AirPlay connection after it has been paused
for 60 minutes, or after 8 minutes if it played to the end before pausing.
Reviewed by Brent Fulgham.
* Modules/mediasession/WebMediaSessionManager.cpp:
(WebCore::WebMediaSessionManager::WebMediaSessionManager): Initialize m_watchdogTimer.
(WebCore::WebMediaSessionManager::clientStateDidChange): Schedule watchdog timer configuration
if the client started playing or paused.
(WebCore::WebMediaSessionManager::configurePlaybackTargetClients): Schedule watchdog timer configuration.
(WebCore::WebMediaSessionManager::toString): Print watchdog configuration flag.
(WebCore::WebMediaSessionManager::taskTimerFired): Call configureWatchdogTimer.
(WebCore::WebMediaSessionManager::configureWatchdogTimer): New, start or stop watchdog timer.
(WebCore::WebMediaSessionManager::watchdogTimerFired): Stop monitoring for targets, which
clears the route.
* Modules/mediasession/WebMediaSessionManager.h:
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::mediaState): Set DidPlayToEnd when appropriate.
* page/MediaProducer.h: Add DidPlayToEnd.
* platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
(WebCore::MediaPlaybackTargetPickerMac::~MediaPlaybackTargetPickerMac): Clear m_client, call
stopMonitoringPlaybackTargets.
(WebCore::MediaPlaybackTargetPickerMac::pendingActionTimerFired): Send a neutered
MediaPlaybackTarget when m_outputDeviceMenuController is NULL.
(WebCore::MediaPlaybackTargetPickerMac::devicePicker): Add logging.
(WebCore::MediaPlaybackTargetPickerMac::stopMonitoringPlaybackTargets): Clear the menu
controller to cancel the route.</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="#trunkSourceWebCorepageMediaProducerh">trunk/Source/WebCore/page/MediaProducer.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 (186360 => 186361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-06 17:59:18 UTC (rev 186360)
+++ trunk/Source/WebCore/ChangeLog 2015-07-06 18:04:10 UTC (rev 186361)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2015-07-06 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] Inactive AirPlay route should automatically timeout
+ https://bugs.webkit.org/show_bug.cgi?id=146642
+ <rdar://problem/21602955>
+
+ Automatically clear a media element's AirPlay connection after it has been paused
+ for 60 minutes, or after 8 minutes if it played to the end before pausing.
+
+ Reviewed by Brent Fulgham.
+
+ * Modules/mediasession/WebMediaSessionManager.cpp:
+ (WebCore::WebMediaSessionManager::WebMediaSessionManager): Initialize m_watchdogTimer.
+ (WebCore::WebMediaSessionManager::clientStateDidChange): Schedule watchdog timer configuration
+ if the client started playing or paused.
+ (WebCore::WebMediaSessionManager::configurePlaybackTargetClients): Schedule watchdog timer configuration.
+ (WebCore::WebMediaSessionManager::toString): Print watchdog configuration flag.
+ (WebCore::WebMediaSessionManager::taskTimerFired): Call configureWatchdogTimer.
+ (WebCore::WebMediaSessionManager::configureWatchdogTimer): New, start or stop watchdog timer.
+ (WebCore::WebMediaSessionManager::watchdogTimerFired): Stop monitoring for targets, which
+ clears the route.
+ * Modules/mediasession/WebMediaSessionManager.h:
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::mediaState): Set DidPlayToEnd when appropriate.
+
+ * page/MediaProducer.h: Add DidPlayToEnd.
+
+ * platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
+ (WebCore::MediaPlaybackTargetPickerMac::~MediaPlaybackTargetPickerMac): Clear m_client, call
+ stopMonitoringPlaybackTargets.
+ (WebCore::MediaPlaybackTargetPickerMac::pendingActionTimerFired): Send a neutered
+ MediaPlaybackTarget when m_outputDeviceMenuController is NULL.
+ (WebCore::MediaPlaybackTargetPickerMac::devicePicker): Add logging.
+ (WebCore::MediaPlaybackTargetPickerMac::stopMonitoringPlaybackTargets): Clear the menu
+ controller to cancel the route.
+
</ins><span class="cx"> 2015-07-06 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Fix build errors with OpenGL ES
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionWebMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp (186360 => 186361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2015-07-06 17:59:18 UTC (rev 186360)
+++ trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2015-07-06 18:04:10 UTC (rev 186361)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> WebCore::MediaProducer::MediaStateFlags flags { WebCore::MediaProducer::IsNotPlaying };
</span><span class="cx"> bool requestedPicker { false };
</span><span class="cx"> bool configurationRequired { true };
</span><ins>+ bool playedToEnd { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static bool flagsAreSet(MediaProducer::MediaStateFlags value, unsigned flags)
</span><span class="lines">@@ -87,6 +88,7 @@
</span><span class="cx">
</span><span class="cx"> WebMediaSessionManager::WebMediaSessionManager()
</span><span class="cx"> : m_taskTimer(RunLoop::current(), this, &WebMediaSessionManager::taskTimerFired)
</span><ins>+ , m_watchdogTimer(RunLoop::current(), this, &WebMediaSessionManager::watchdogTimerFired)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -171,6 +173,13 @@
</span><span class="cx"> if (!flagsAreSet(oldFlags, MediaProducer::RequiresPlaybackTargetMonitoring) && flagsAreSet(newFlags, MediaProducer::RequiresPlaybackTargetMonitoring))
</span><span class="cx"> scheduleDelayedTask(TargetMonitoringConfigurationTask);
</span><span class="cx">
</span><ins>+ MediaProducer::MediaStateFlags playingToTargetFlags = MediaProducer::IsPlayingToExternalDevice | MediaProducer::IsPlayingVideo;
+ if ((oldFlags & playingToTargetFlags) != (newFlags & playingToTargetFlags)) {
+ if (flagsAreSet(oldFlags, MediaProducer::IsPlayingVideo) && !flagsAreSet(newFlags, MediaProducer::IsPlayingVideo) && flagsAreSet(newFlags, MediaProducer::DidPlayToEnd))
+ changedClientState->playedToEnd = true;
+ scheduleDelayedTask(WatchdogTimerConfigurationTask);
+ }
+
</ins><span class="cx"> if (!m_playbackTarget || !m_playbackTarget->hasActiveRoute())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -276,6 +285,8 @@
</span><span class="cx"> if (!flagsAreSet(state->flags, MediaProducer::IsPlayingToExternalDevice))
</span><span class="cx"> state->client.setShouldPlayToPlaybackTarget(state->contextId, true);
</span><span class="cx"> }
</span><ins>+
+ configureWatchdogTimer();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebMediaSessionManager::configurePlaybackTargetMonitoring()
</span><span class="lines">@@ -306,6 +317,8 @@
</span><span class="cx"> string.append("TargetClientsConfigurationTask + ");
</span><span class="cx"> if (tasks & TargetMonitoringConfigurationTask)
</span><span class="cx"> string.append("TargetMonitoringConfigurationTask + ");
</span><ins>+ if (tasks & WatchdogTimerConfigurationTask)
+ string.append("WatchdogTimerConfigurationTask + ");
</ins><span class="cx"> if (string.isEmpty())
</span><span class="cx"> string.append("NoTask");
</span><span class="cx"> else
</span><span class="lines">@@ -333,6 +346,8 @@
</span><span class="cx"> configurePlaybackTargetClients();
</span><span class="cx"> if (m_taskFlags & TargetMonitoringConfigurationTask)
</span><span class="cx"> configurePlaybackTargetMonitoring();
</span><ins>+ if (m_taskFlags & WatchdogTimerConfigurationTask)
+ configureWatchdogTimer();
</ins><span class="cx">
</span><span class="cx"> m_taskFlags = NoTask;
</span><span class="cx"> }
</span><span class="lines">@@ -347,6 +362,49 @@
</span><span class="cx"> return notFound;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebMediaSessionManager::configureWatchdogTimer()
+{
+ static const double watchdogTimerIntervalAfterPausing = 60 * 60;
+ static const double watchdogTimerIntervalAfterPlayingToEnd = 8 * 60;
+
+ if (!m_playbackTarget || !m_playbackTarget->hasActiveRoute()) {
+ m_watchdogTimer.stop();
+ return;
+ }
+
+ bool stopTimer = false;
+ bool didPlayToEnd = false;
+ for (auto& state : m_clientState) {
+ if (flagsAreSet(state->flags, MediaProducer::IsPlayingToExternalDevice) && flagsAreSet(state->flags, MediaProducer::IsPlayingVideo))
+ stopTimer = true;
+ if (state->playedToEnd)
+ didPlayToEnd = true;
+ state->playedToEnd = false;
+ }
+
+ if (stopTimer) {
+ m_currentWatchdogInterval = 0;
+ m_watchdogTimer.stop();
+ LOG(Media, "WebMediaSessionManager::configureWatchdogTimer - timer stopped");
+ } else {
+ double interval = didPlayToEnd ? watchdogTimerIntervalAfterPlayingToEnd : watchdogTimerIntervalAfterPausing;
+ if (interval != m_currentWatchdogInterval || !m_watchdogTimer.isActive()) {
+ m_watchdogTimer.startOneShot(interval);
+ LOG(Media, "WebMediaSessionManager::configureWatchdogTimer - timer scheduled for %.0f", interval);
+ }
+ m_currentWatchdogInterval = interval;
+ }
+}
+
+void WebMediaSessionManager::watchdogTimerFired()
+{
+ LOG(Media, "WebMediaSessionManager::watchdogTimerFired");
+ if (!m_playbackTarget)
+ return;
+
+ targetPicker().stopMonitoringPlaybackTargets();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionWebMediaSessionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h (186360 => 186361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h 2015-07-06 17:59:18 UTC (rev 186360)
+++ trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h 2015-07-06 18:04:10 UTC (rev 186361)
</span><span class="lines">@@ -67,23 +67,30 @@
</span><span class="cx"> void configurePlaybackTargetClients();
</span><span class="cx"> void configureNewClients();
</span><span class="cx"> void configurePlaybackTargetMonitoring();
</span><ins>+ void configureWatchdogTimer();
</ins><span class="cx">
</span><span class="cx"> enum ConfigurationTaskFlags {
</span><span class="cx"> NoTask = 0,
</span><span class="cx"> InitialConfigurationTask = 1 << 0,
</span><span class="cx"> TargetClientsConfigurationTask = 1 << 1,
</span><span class="cx"> TargetMonitoringConfigurationTask = 1 << 2,
</span><ins>+ WatchdogTimerConfigurationTask = 1 << 3,
</ins><span class="cx"> };
</span><span class="cx"> typedef unsigned ConfigurationTasks;
</span><span class="cx"> String toString(ConfigurationTasks);
</span><span class="cx">
</span><span class="cx"> void scheduleDelayedTask(ConfigurationTasks);
</span><span class="cx"> void taskTimerFired();
</span><ins>+
+ void watchdogTimerFired();
+
</ins><span class="cx"> RunLoop::Timer<WebMediaSessionManager> m_taskTimer;
</span><ins>+ RunLoop::Timer<WebMediaSessionManager> m_watchdogTimer;
</ins><span class="cx">
</span><span class="cx"> Vector<std::unique_ptr<ClientState>> m_clientState;
</span><span class="cx"> RefPtr<MediaPlaybackTarget> m_playbackTarget;
</span><span class="cx"> ConfigurationTasks m_taskFlags { NoTask };
</span><ins>+ double m_currentWatchdogInterval { 0 };
</ins><span class="cx"> bool m_externalOutputDeviceAvailable { false };
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (186360 => 186361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-07-06 17:59:18 UTC (rev 186360)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-07-06 18:04:10 UTC (rev 186361)
</span><span class="lines">@@ -6372,6 +6372,9 @@
</span><span class="cx"> bool requireUserGesture = m_mediaSession->hasBehaviorRestriction(MediaElementSession::RequireUserGestureToAutoplayToExternalDevice);
</span><span class="cx"> if (hasActiveVideo && (!requireUserGesture || (hasAudio && !m_initiallyMuted && !loop())) && !m_failedToPlayToWirelessTarget)
</span><span class="cx"> state |= ExternalDeviceAutoPlayCandidate;
</span><ins>+
+ if (hasActiveVideo && endedPlayback())
+ state |= DidPlayToEnd;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (!isPlaying())
</span></span></pre></div>
<a id="trunkSourceWebCorepageMediaProducerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/MediaProducer.h (186360 => 186361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/MediaProducer.h 2015-07-06 17:59:18 UTC (rev 186360)
+++ trunk/Source/WebCore/page/MediaProducer.h 2015-07-06 18:04:10 UTC (rev 186361)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> IsPlayingToExternalDevice = 1 << 2,
</span><span class="cx"> RequiresPlaybackTargetMonitoring = 1 << 3,
</span><span class="cx"> ExternalDeviceAutoPlayCandidate = 1 << 4,
</span><ins>+ DidPlayToEnd = 1 << 5,
</ins><span class="cx"> };
</span><span class="cx"> typedef unsigned MediaStateFlags;
</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 (186360 => 186361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2015-07-06 17:59:18 UTC (rev 186360)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2015-07-06 18:04:10 UTC (rev 186361)
</span><span class="lines">@@ -83,34 +83,31 @@
</span><span class="cx">
</span><span class="cx"> MediaPlaybackTargetPickerMac::~MediaPlaybackTargetPickerMac()
</span><span class="cx"> {
</span><ins>+ m_client = nullptr;
</ins><span class="cx"> m_pendingActionTimer.stop();
</span><span class="cx"> [m_outputDeviceMenuControllerDelegate clearCallback];
</span><span class="cx">
</span><del>- if (m_outputDeviceMenuController) {
- [m_outputDeviceMenuController removeObserver:m_outputDeviceMenuControllerDelegate.get() forKeyPath:externalOutputDeviceAvailableKeyName];
- [m_outputDeviceMenuController removeObserver:m_outputDeviceMenuControllerDelegate.get() forKeyPath:externalOutputDevicePickedKeyName];
- m_outputDeviceMenuController = nullptr;
- }
</del><ins>+ stopMonitoringPlaybackTargets();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlaybackTargetPickerMac::pendingActionTimerFired()
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlaybackTargetPickerMac::pendingActionTimerFired - flags = 0x%x", m_pendingActionFlags);
</span><span class="cx">
</span><del>- if (!m_outputDeviceMenuController || !m_client)
</del><ins>+ if (!m_client)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> PendingActionFlags pendingActions = m_pendingActionFlags;
</span><span class="cx"> m_pendingActionFlags = 0;
</span><span class="cx">
</span><ins>+ if (pendingActions & CurrentDeviceDidChange) {
+ AVOutputContext* context = m_outputDeviceMenuController ? [m_outputDeviceMenuController.get() outputContext] : nullptr;
+ m_client->setPlaybackTarget(WebCore::MediaPlaybackTargetMac::create(context));
+ }
+
</ins><span class="cx"> if (pendingActions & OutputDeviceAvailabilityChanged)
</span><span class="cx"> m_client->externalOutputDeviceAvailableDidChange(devicePicker().externalOutputDeviceAvailable);
</span><span class="cx">
</span><del>- if (pendingActions & CurrentDeviceDidChange) {
- AVOutputDeviceMenuControllerType* devicePicker = this->devicePicker();
- if (devicePicker)
- m_client->setPlaybackTarget(WebCore::MediaPlaybackTargetMac::create([devicePicker outputContext]));
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlaybackTargetPickerMac::availableDevicesDidChange()
</span><span class="lines">@@ -129,6 +126,8 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (!m_outputDeviceMenuController) {
</span><ins>+ LOG(Media, "MediaPlaybackTargetPickerMac::devicePicker - allocating picker");
+
</ins><span class="cx"> RetainPtr<AVOutputContextType> context = adoptNS([[getAVOutputContextClass() alloc] init]);
</span><span class="cx"> m_outputDeviceMenuController = adoptNS([[getAVOutputDeviceMenuControllerClass() alloc] initWithOutputContext:context.get()]);
</span><span class="cx">
</span><span class="lines">@@ -190,7 +189,12 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlaybackTargetPickerMac::stopMonitoringPlaybackTargets");
</span><span class="cx">
</span><del>- // FIXME: update once rdar://21062536 has been fixed.
</del><ins>+ if (m_outputDeviceMenuController) {
+ [m_outputDeviceMenuController removeObserver:m_outputDeviceMenuControllerDelegate.get() forKeyPath:externalOutputDeviceAvailableKeyName];
+ [m_outputDeviceMenuController removeObserver:m_outputDeviceMenuControllerDelegate.get() forKeyPath:externalOutputDevicePickedKeyName];
+ m_outputDeviceMenuController = nullptr;
+ }
+ currentDeviceDidChange();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>