<!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>[184788] 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/184788">184788</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-05-22 12:14:48 -0700 (Fri, 22 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Device picker menu should be persistent
https://bugs.webkit.org/show_bug.cgi?id=145311
Reviewed by Brent Fulgham.
* Modules/mediasession/WebMediaSessionManager.cpp:
(WebCore::WebMediaSessionManager::addPlaybackTargetPickerClient): Add logging.
(WebCore::WebMediaSessionManager::removePlaybackTargetPickerClient): Ditto.
(WebCore::WebMediaSessionManager::removeAllPlaybackTargetPickerClients): Ditto.
(WebCore::WebMediaSessionManager::showPlaybackTargetPicker): Ditto.
(WebCore::WebMediaSessionManager::clientStateDidChange): Ditto.
(WebCore::WebMediaSessionManager::externalOutputDeviceAvailableDidChange): Ditto.
(WebCore::WebMediaSessionManager::configurePlaybackTargetMonitoring): Ditto.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::mediaState): Don't set ExternalDeviceAutoPlayCandidate unless
there is an event listener.
* platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
(WebCore::MediaPlaybackTargetPickerMac::~MediaPlaybackTargetPickerMac): Release the menu
controller and remove observers.
(WebCore::MediaPlaybackTargetPickerMac::create): Add logging.
(WebCore::MediaPlaybackTargetPickerMac::pendingActionTimerFired): Ditto.
(WebCore::MediaPlaybackTargetPickerMac::availableDevicesDidChange): Ditto.
(WebCore::MediaPlaybackTargetPickerMac::devicePicker): Ditto.
(WebCore::MediaPlaybackTargetPickerMac::showPlaybackTargetPicker): Ditto.
(WebCore::MediaPlaybackTargetPickerMac::addPendingAction): Start the timer after
a brief pause to debounce multiple identical notifications.
(WebCore::MediaPlaybackTargetPickerMac::currentDeviceDidChange): Add logging.
(WebCore::MediaPlaybackTargetPickerMac::startingMonitoringPlaybackTargets): Add logging.
(WebCore::MediaPlaybackTargetPickerMac::stopMonitoringPlaybackTargets): Don't release
the menu controller delegate.
(-[WebAVOutputDeviceMenuControllerHelper observeValueForKeyPath:ofObject:change:context:]): Add logging.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::setWirelessPlaybackTarget): Update logging.
(WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget): Ditto.</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="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlaybackTargetPickerMacmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm</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 (184787 => 184788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-22 19:11:46 UTC (rev 184787)
+++ trunk/Source/WebCore/ChangeLog 2015-05-22 19:14:48 UTC (rev 184788)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2015-05-22 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] Device picker menu should be persistent
+ https://bugs.webkit.org/show_bug.cgi?id=145311
+
+ Reviewed by Brent Fulgham.
+
+ * Modules/mediasession/WebMediaSessionManager.cpp:
+ (WebCore::WebMediaSessionManager::addPlaybackTargetPickerClient): Add logging.
+ (WebCore::WebMediaSessionManager::removePlaybackTargetPickerClient): Ditto.
+ (WebCore::WebMediaSessionManager::removeAllPlaybackTargetPickerClients): Ditto.
+ (WebCore::WebMediaSessionManager::showPlaybackTargetPicker): Ditto.
+ (WebCore::WebMediaSessionManager::clientStateDidChange): Ditto.
+ (WebCore::WebMediaSessionManager::externalOutputDeviceAvailableDidChange): Ditto.
+ (WebCore::WebMediaSessionManager::configurePlaybackTargetMonitoring): Ditto.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::mediaState): Don't set ExternalDeviceAutoPlayCandidate unless
+ there is an event listener.
+
+ * platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
+ (WebCore::MediaPlaybackTargetPickerMac::~MediaPlaybackTargetPickerMac): Release the menu
+ controller and remove observers.
+ (WebCore::MediaPlaybackTargetPickerMac::create): Add logging.
+ (WebCore::MediaPlaybackTargetPickerMac::pendingActionTimerFired): Ditto.
+ (WebCore::MediaPlaybackTargetPickerMac::availableDevicesDidChange): Ditto.
+ (WebCore::MediaPlaybackTargetPickerMac::devicePicker): Ditto.
+ (WebCore::MediaPlaybackTargetPickerMac::showPlaybackTargetPicker): Ditto.
+ (WebCore::MediaPlaybackTargetPickerMac::addPendingAction): Start the timer after
+ a brief pause to debounce multiple identical notifications.
+ (WebCore::MediaPlaybackTargetPickerMac::currentDeviceDidChange): Add logging.
+ (WebCore::MediaPlaybackTargetPickerMac::startingMonitoringPlaybackTargets): Add logging.
+ (WebCore::MediaPlaybackTargetPickerMac::stopMonitoringPlaybackTargets): Don't release
+ the menu controller delegate.
+ (-[WebAVOutputDeviceMenuControllerHelper observeValueForKeyPath:ofObject:change:context:]): Add logging.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setWirelessPlaybackTarget): Update logging.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget): Ditto.
+
</ins><span class="cx"> 2015-05-22 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix. Added a platform ifdef.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionWebMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp (184787 => 184788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2015-05-22 19:11:46 UTC (rev 184787)
+++ trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2015-05-22 19:14:48 UTC (rev 184788)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #include "FloatRect.h"
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include "MediaPlaybackTargetPickerMac.h"
</span><span class="cx"> #include "WebMediaSessionManagerClient.h"
</span><span class="cx">
</span><span class="lines">@@ -76,6 +77,8 @@
</span><span class="cx"> if (index != notFound)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><ins>+ LOG(Media, "WebMediaSessionManager::addPlaybackTargetPickerClient(%p + %llu)", &client, contextId);
+
</ins><span class="cx"> m_clientState.append(std::make_unique<ClientState>(client, contextId));
</span><span class="cx">
</span><span class="cx"> if (m_externalOutputDeviceAvailable || m_playbackTarget)
</span><span class="lines">@@ -91,12 +94,16 @@
</span><span class="cx"> if (index == notFound)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ LOG(Media, "WebMediaSessionManager::removePlaybackTargetPickerClient(%p + %llu)", &client, contextId);
+
</ins><span class="cx"> m_clientState.remove(index);
</span><span class="cx"> scheduleDelayedTask(TargetMonitoringConfigurationTask | TargetClientsConfigurationTask);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebMediaSessionManager::removeAllPlaybackTargetPickerClients(WebMediaSessionManagerClient& client)
</span><span class="cx"> {
</span><ins>+ LOG(Media, "WebMediaSessionManager::removeAllPlaybackTargetPickerClients(%p)", &client);
+
</ins><span class="cx"> for (size_t i = m_clientState.size(); i > 0; --i) {
</span><span class="cx"> if (&m_clientState[i - 1]->client == &client)
</span><span class="cx"> m_clientState.remove(i - 1);
</span><span class="lines">@@ -116,6 +123,7 @@
</span><span class="cx"> state->requestedPicker = state == clientRequestingPicker;
</span><span class="cx">
</span><span class="cx"> bool hasActiveRoute = flagsAreSet(m_clientState[index]->flags, MediaProducer::IsPlayingToExternalDevice);
</span><ins>+ LOG(Media, "WebMediaSessionManager::showPlaybackTargetPicker(%p + %llu) - hasActiveRoute = %i", &client, contextId, (int)hasActiveRoute);
</ins><span class="cx"> targetPicker().showPlaybackTargetPicker(FloatRect(rect), hasActiveRoute);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -128,6 +136,7 @@
</span><span class="cx">
</span><span class="cx"> auto& changedClientState = m_clientState[index];
</span><span class="cx"> MediaProducer::MediaStateFlags oldFlags = changedClientState->flags;
</span><ins>+ LOG(Media, "WebMediaSessionManager::clientStateDidChange(%p + %llu) - new flags = 0x%x, old flags = 0x%x", &client, contextId, newFlags, oldFlags);
</ins><span class="cx"> if (newFlags == oldFlags)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -175,6 +184,8 @@
</span><span class="cx">
</span><span class="cx"> void WebMediaSessionManager::externalOutputDeviceAvailableDidChange(bool available)
</span><span class="cx"> {
</span><ins>+ LOG(Media, "WebMediaSessionManager::externalOutputDeviceAvailableDidChange - clients = %zu, available = %i", m_clientState.size(), (int)available);
+
</ins><span class="cx"> m_externalOutputDeviceAvailable = available;
</span><span class="cx"> for (auto& state : m_clientState)
</span><span class="cx"> state->client.externalOutputDeviceAvailableDidChange(state->contextId, available);
</span><span class="lines">@@ -246,6 +257,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ LOG(Media, "WebMediaSessionManager::configurePlaybackTargetMonitoring - monitoringRequired = %i", (int)monitoringRequired);
+
</ins><span class="cx"> if (monitoringRequired)
</span><span class="cx"> targetPicker().startingMonitoringPlaybackTargets();
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (184787 => 184788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-05-22 19:11:46 UTC (rev 184787)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-05-22 19:14:48 UTC (rev 184788)
</span><span class="lines">@@ -6281,10 +6281,8 @@
</span><span class="cx"> if (isPlayingToWirelessPlaybackTarget())
</span><span class="cx"> state |= IsPlayingToExternalDevice;
</span><span class="cx">
</span><del>- if (!m_mediaSession->wirelessVideoPlaybackDisabled(*this)) {
- if ((m_hasPlaybackTargetAvailabilityListeners || hasActiveVideo) && m_player->canPlayToWirelessPlaybackTarget())
- state |= RequiresPlaybackTargetMonitoring;
- }
</del><ins>+ if (!m_mediaSession->wirelessVideoPlaybackDisabled(*this) && m_hasPlaybackTargetAvailabilityListeners && m_player->canPlayToWirelessPlaybackTarget())
+ state |= RequiresPlaybackTargetMonitoring;
</ins><span class="cx">
</span><span class="cx"> bool requireUserGesture = m_mediaSession->hasBehaviorRestriction(HTMLMediaSession::RequireUserGestureToAutoplayToExternalDevice);
</span><span class="cx"> if (hasActiveVideo && (!requireUserGesture || (hasAudio && !loop())))
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlaybackTargetPickerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm (184787 => 184788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2015-05-22 19:11:46 UTC (rev 184787)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2015-05-22 19:14:48 UTC (rev 184788)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
</span><span class="cx">
</span><ins>+#import "Logging.h"
</ins><span class="cx"> #import <WebCore/AVFoundationSPI.h>
</span><span class="cx"> #import <WebCore/AVKitSPI.h>
</span><span class="cx"> #import <WebCore/FloatRect.h>
</span><span class="lines">@@ -66,6 +67,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static const double pendingActionInterval = 1.0 / 10.0;
+
</ins><span class="cx"> std::unique_ptr<MediaPlaybackTargetPickerMac> MediaPlaybackTargetPickerMac::create(MediaPlaybackTargetPicker::Client& client)
</span><span class="cx"> {
</span><span class="cx"> return std::unique_ptr<MediaPlaybackTargetPickerMac>(new MediaPlaybackTargetPickerMac(client));
</span><span class="lines">@@ -82,11 +85,18 @@
</span><span class="cx"> {
</span><span class="cx"> m_pendingActionTimer.stop();
</span><span class="cx"> [m_outputDeviceMenuControllerDelegate clearCallback];
</span><del>- stopMonitoringPlaybackTargets();
</del><ins>+
+ if (m_outputDeviceMenuController) {
+ [m_outputDeviceMenuController removeObserver:m_outputDeviceMenuControllerDelegate.get() forKeyPath:externalOutputDeviceAvailableKeyName];
+ [m_outputDeviceMenuController removeObserver:m_outputDeviceMenuControllerDelegate.get() forKeyPath:externalOutputDevicePickedKeyName];
+ m_outputDeviceMenuController = nullptr;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlaybackTargetPickerMac::pendingActionTimerFired()
</span><span class="cx"> {
</span><ins>+ LOG(Media, "MediaPlaybackTargetPickerMac::pendingActionTimerFired - flags = 0x%x", m_pendingActionFlags);
+
</ins><span class="cx"> if (!m_outputDeviceMenuController || !m_client)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -105,6 +115,8 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlaybackTargetPickerMac::availableDevicesDidChange()
</span><span class="cx"> {
</span><ins>+ LOG(Media, "MediaPlaybackTargetPickerMac::availableDevicesDidChange - available = %i", (int)devicePicker().externalOutputDeviceAvailable);
+
</ins><span class="cx"> if (!m_client)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -123,6 +135,8 @@
</span><span class="cx"> [m_outputDeviceMenuController.get() addObserver:m_outputDeviceMenuControllerDelegate.get() forKeyPath:externalOutputDeviceAvailableKeyName options:NSKeyValueObservingOptionNew context:nullptr];
</span><span class="cx"> [m_outputDeviceMenuController.get() addObserver:m_outputDeviceMenuControllerDelegate.get() forKeyPath:externalOutputDevicePickedKeyName options:NSKeyValueObservingOptionNew context:nullptr];
</span><span class="cx">
</span><ins>+ LOG(Media, "MediaPlaybackTargetPickerMac::devicePicker - allocated menu controller %p", m_outputDeviceMenuController.get());
+
</ins><span class="cx"> if (m_outputDeviceMenuController.get().externalOutputDeviceAvailable)
</span><span class="cx"> availableDevicesDidChange();
</span><span class="cx"> }
</span><span class="lines">@@ -135,6 +149,8 @@
</span><span class="cx"> if (!m_client || m_showingMenu)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ LOG(Media, "MediaPlaybackTargetPickerMac::showPlaybackTargetPicker - checkActiveRoute = %i", (int)checkActiveRoute);
+
</ins><span class="cx"> AVOutputDeviceMenuControllerType *picker = devicePicker();
</span><span class="cx"> if (![picker respondsToSelector:@selector(showMenuForRect:appearanceName:allowReselectionOfSelectedOutputDevice:)])
</span><span class="cx"> return;
</span><span class="lines">@@ -150,11 +166,13 @@
</span><span class="cx"> void MediaPlaybackTargetPickerMac::addPendingAction(PendingActionFlags action)
</span><span class="cx"> {
</span><span class="cx"> m_pendingActionFlags |= action;
</span><del>- m_pendingActionTimer.startOneShot(0);
</del><ins>+ m_pendingActionTimer.startOneShot(pendingActionInterval);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlaybackTargetPickerMac::currentDeviceDidChange()
</span><span class="cx"> {
</span><ins>+ LOG(Media, "MediaPlaybackTargetPickerMac::currentDeviceDidChange");
+
</ins><span class="cx"> if (!m_client)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -163,16 +181,16 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlaybackTargetPickerMac::startingMonitoringPlaybackTargets()
</span><span class="cx"> {
</span><ins>+ LOG(Media, "MediaPlaybackTargetPickerMac::startingMonitoringPlaybackTargets");
+
</ins><span class="cx"> devicePicker();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlaybackTargetPickerMac::stopMonitoringPlaybackTargets()
</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>+ LOG(Media, "MediaPlaybackTargetPickerMac::stopMonitoringPlaybackTargets");
+
+ // FIXME: update once rdar://21062536 has been fixed.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="lines">@@ -202,6 +220,8 @@
</span><span class="cx"> if (!m_callback)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ LOG(Media, "MediaPlaybackTargetPickerMac::observeValueForKeyPath - key = %s", [keyPath UTF8String]);
+
</ins><span class="cx"> if (![keyPath isEqualToString:externalOutputDeviceAvailableKeyName] && ![keyPath isEqualToString:externalOutputDevicePickedKeyName])
</span><span class="cx"> return;
</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 (184787 => 184788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-05-22 19:11:46 UTC (rev 184787)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-05-22 19:14:48 UTC (rev 184788)
</span><span class="lines">@@ -2797,7 +2797,7 @@
</span><span class="cx"> MediaPlaybackTargetMac* macTarget = toMediaPlaybackTargetMac(&target.get());
</span><span class="cx">
</span><span class="cx"> m_outputContext = macTarget->outputContext();
</span><del>- LOG(Media, "MediaPlayerPrivateAVFoundationObjC::setWirelessPlaybackTarget(%p) - target = %p", this, m_outputContext.get());
</del><ins>+ LOG(Media, "MediaPlayerPrivateAVFoundationObjC::setWirelessPlaybackTarget(%p) - target = %p, device name = %s", this, m_outputContext.get(), [m_outputContext.get().deviceName UTF8String]);
</ins><span class="cx">
</span><span class="cx"> if (!m_outputContext || !m_outputContext.get().deviceName)
</span><span class="cx"> setShouldPlayToPlaybackTarget(false);
</span><span class="lines">@@ -2812,14 +2812,15 @@
</span><span class="cx">
</span><span class="cx"> AVOutputContext *newContext = shouldPlay ? m_outputContext.get() : nil;
</span><span class="cx"> RetainPtr<AVOutputContext> currentContext = m_avPlayer.get().outputContext;
</span><ins>+
+ LOG(Media, "MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget(%p) - target = %p, shouldPlay = %s", this, newContext, boolString(shouldPlay));
+
</ins><span class="cx"> if ((!newContext && !currentContext.get()) || [currentContext.get() isEqual:newContext])
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> setDelayCallbacks(true);
</span><span class="cx"> m_avPlayer.get().outputContext = newContext;
</span><span class="cx"> setDelayCallbacks(false);
</span><del>-
- LOG(Media, "MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget(%p) - target = %p, playing to target = %s", this, m_avPlayer.get().outputContext, boolString(shouldPlay));
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MediaPlayerPrivateAVFoundationObjC::isPlayingToWirelessPlaybackTarget()
</span></span></pre>
</div>
</div>
</body>
</html>