<!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>[175976] 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/175976">175976</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2014-11-11 14:03:15 -0800 (Tue, 11 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] cleanup wireless route monitoring
https://bugs.webkit.org/show_bug.cgi?id=138614
Reviewed by Jer Noble.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::clearMediaPlayer): Add logging.
(WebCore::HTMLMediaElement::removeEventListener): Ditto.
(WebCore::HTMLMediaElement::createMediaPlayer): Ditto.
* platform/audio/ios/MediaSessionManagerIOS.mm:
(WebCore::MediaSessionManageriOS::resetRestrictions): Add logging.
(WebCore::MediaSessionManageriOS::configureWireLessTargetMonitoring): Ditto.
(WebCore::MediaSessionManageriOS::updateNowPlayingInfo): Ditto.
(-[WebMediaSessionHelper initWithCallback:]): Ditto.
(-[WebMediaSessionHelper dealloc]): Always deallocate volume view and routing controller
on the main thread.
(-[WebMediaSessionHelper clearCallback]): Add logging.
(-[WebMediaSessionHelper hasWirelessTargetsAvailable]): Ditto.
(-[WebMediaSessionHelper startMonitoringAirPlayRoutes]): Always call routing controller on
the main thread.
(-[WebMediaSessionHelper stopMonitoringAirPlayRoutes]): Ditto.
(-[WebMediaSessionHelper interruption:]): Add logging.
(-[WebMediaSessionHelper applicationWillEnterForeground:]): Ditto.
(-[WebMediaSessionHelper applicationDidBecomeActive:]): Ditto.
(-[WebMediaSessionHelper applicationWillResignActive:]): Ditto.
(-[WebMediaSessionHelper wirelessRoutesAvailableDidChange:]): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm">trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175975 => 175976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-11 22:02:16 UTC (rev 175975)
+++ trunk/Source/WebCore/ChangeLog 2014-11-11 22:03:15 UTC (rev 175976)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-11-11 Eric Carlson <eric.carlson@apple.com>
+
+ [iOS] cleanup wireless route monitoring
+ https://bugs.webkit.org/show_bug.cgi?id=138614
+
+ Reviewed by Jer Noble.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::clearMediaPlayer): Add logging.
+ (WebCore::HTMLMediaElement::removeEventListener): Ditto.
+ (WebCore::HTMLMediaElement::createMediaPlayer): Ditto.
+
+ * platform/audio/ios/MediaSessionManagerIOS.mm:
+ (WebCore::MediaSessionManageriOS::resetRestrictions): Add logging.
+ (WebCore::MediaSessionManageriOS::configureWireLessTargetMonitoring): Ditto.
+ (WebCore::MediaSessionManageriOS::updateNowPlayingInfo): Ditto.
+ (-[WebMediaSessionHelper initWithCallback:]): Ditto.
+ (-[WebMediaSessionHelper dealloc]): Always deallocate volume view and routing controller
+ on the main thread.
+ (-[WebMediaSessionHelper clearCallback]): Add logging.
+ (-[WebMediaSessionHelper hasWirelessTargetsAvailable]): Ditto.
+ (-[WebMediaSessionHelper startMonitoringAirPlayRoutes]): Always call routing controller on
+ the main thread.
+ (-[WebMediaSessionHelper stopMonitoringAirPlayRoutes]): Ditto.
+ (-[WebMediaSessionHelper interruption:]): Add logging.
+ (-[WebMediaSessionHelper applicationWillEnterForeground:]): Ditto.
+ (-[WebMediaSessionHelper applicationDidBecomeActive:]): Ditto.
+ (-[WebMediaSessionHelper applicationWillResignActive:]): Ditto.
+ (-[WebMediaSessionHelper wirelessRoutesAvailableDidChange:]): Ditto.
+
</ins><span class="cx"> 2014-11-11 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewd iOS build fix
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (175975 => 175976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-11-11 22:02:16 UTC (rev 175975)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-11-11 22:03:15 UTC (rev 175976)
</span><span class="lines">@@ -4651,6 +4651,8 @@
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::clearMediaPlayer(int flags)
</span><span class="cx"> {
</span><ins>+ LOG(Media, "HTMLMediaElement::clearMediaPlayer(%p) - flags = %x", this, (unsigned)flags);
+
</ins><span class="cx"> #if USE(PLATFORM_TEXT_TRACK_MENU)
</span><span class="cx"> if (platformTextTrackMenu()) {
</span><span class="cx"> m_platformMenu->setClient(0);
</span><span class="lines">@@ -4855,6 +4857,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bool didRemoveLastAvailabilityChangedListener = !hasEventListeners(eventNames().webkitplaybacktargetavailabilitychangedEvent);
</span><ins>+ LOG(Media, "HTMLMediaElement::removeEventListener(%p) - removed last listener = %s", this, boolString(didRemoveLastAvailabilityChangedListener));
</ins><span class="cx"> if (didRemoveLastAvailabilityChangedListener)
</span><span class="cx"> m_mediaSession->setHasPlaybackTargetAvailabilityListeners(*this, false);
</span><span class="cx">
</span><span class="lines">@@ -5357,6 +5360,8 @@
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::createMediaPlayer()
</span><span class="cx"> {
</span><ins>+ LOG(Media, "HTMLMediaElement::createMediaPlayer(%p)", this);
+
</ins><span class="cx"> #if ENABLE(WEB_AUDIO)
</span><span class="cx"> if (m_audioSourceNode)
</span><span class="cx"> m_audioSourceNode->lock();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (175975 => 175976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2014-11-11 22:02:16 UTC (rev 175975)
+++ trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2014-11-11 22:03:15 UTC (rev 175976)
</span><span class="lines">@@ -126,6 +126,8 @@
</span><span class="cx">
</span><span class="cx"> void MediaSessionManageriOS::resetRestrictions()
</span><span class="cx"> {
</span><ins>+ LOG(Media, "MediaSessionManageriOS::resetRestrictions");
+
</ins><span class="cx"> MediaSessionManager::resetRestrictions();
</span><span class="cx">
</span><span class="cx"> static wkDeviceClass deviceClass = iosDeviceClass();
</span><span class="lines">@@ -166,6 +168,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ LOG(Media, "MediaSessionManageriOS::configureWireLessTargetMonitoring - requiresMonitoring = %s", requiresMonitoring ? "true" : "false");
+
</ins><span class="cx"> if (requiresMonitoring)
</span><span class="cx"> [m_objcObserver startMonitoringAirPlayRoutes];
</span><span class="cx"> else
</span><span class="lines">@@ -187,6 +191,8 @@
</span><span class="cx">
</span><span class="cx"> void MediaSessionManageriOS::updateNowPlayingInfo()
</span><span class="cx"> {
</span><ins>+ LOG(Media, "MediaSessionManageriOS::updateNowPlayingInfo");
+
</ins><span class="cx"> MPNowPlayingInfoCenter *nowPlaying = (MPNowPlayingInfoCenter *)[getMPNowPlayingInfoCenterClass() defaultCenter];
</span><span class="cx"> const MediaSession* currentSession = this->currentSession();
</span><span class="cx">
</span><span class="lines">@@ -224,6 +230,8 @@
</span><span class="cx">
</span><span class="cx"> - (id)initWithCallback:(MediaSessionManageriOS*)callback
</span><span class="cx"> {
</span><ins>+ LOG(Media, "-[WebMediaSessionHelper initWithCallback]");
+
</ins><span class="cx"> if (!(self = [super init]))
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="lines">@@ -249,17 +257,38 @@
</span><span class="cx">
</span><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><ins>+ LOG(Media, "-[WebMediaSessionHelper dealloc]");
+
+ if (!isMainThread()) {
+ auto volumeView = WTF::move(_volumeView);
+ auto routingController = WTF::move(_airPlayPresenceRoutingController);
+
+ callOnMainThread([volumeView, routingController] () mutable {
+ LOG(Media, "-[WebMediaSessionHelper dealloc] - dipatched to MainThread");
+
+ volumeView.clear();
+
+ if (!routingController)
+ return;
+
+ [routingController setDiscoveryMode:MPRouteDiscoveryModeDisabled];
+ routingController.clear();
+ });
+ }
+
</ins><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:self];
</span><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)clearCallback
</span><span class="cx"> {
</span><ins>+ LOG(Media, "-[WebMediaSessionHelper clearCallback]");
</ins><span class="cx"> _callback = nil;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)hasWirelessTargetsAvailable
</span><span class="cx"> {
</span><ins>+ LOG(Media, "-[WebMediaSessionHelper hasWirelessTargetsAvailable]");
</ins><span class="cx"> return [_volumeView areWirelessRoutesAvailable];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -268,8 +297,18 @@
</span><span class="cx"> if (_airPlayPresenceRoutingController)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- _airPlayPresenceRoutingController = adoptNS([[getMPAVRoutingControllerClass() alloc] initWithName:@"WebCore - HTML media element checking for AirPlay route presence"]);
- [_airPlayPresenceRoutingController setDiscoveryMode:MPRouteDiscoveryModePresence];
</del><ins>+ LOG(Media, "-[WebMediaSessionHelper startMonitoringAirPlayRoutes]");
+
+ RetainPtr<WebMediaSessionHelper> strongSelf = self;
+ callOnMainThread([strongSelf] () {
+ LOG(Media, "-[WebMediaSessionHelper startMonitoringAirPlayRoutes] - dipatched to MainThread");
+
+ if (strongSelf->_airPlayPresenceRoutingController)
+ return;
+
+ strongSelf->_airPlayPresenceRoutingController = adoptNS([[getMPAVRoutingControllerClass() alloc] initWithName:@"WebCore - HTML media element checking for AirPlay route presence"]);
+ [strongSelf->_airPlayPresenceRoutingController setDiscoveryMode:MPRouteDiscoveryModePresence];
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)stopMonitoringAirPlayRoutes
</span><span class="lines">@@ -277,8 +316,18 @@
</span><span class="cx"> if (!_airPlayPresenceRoutingController)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- [_airPlayPresenceRoutingController setDiscoveryMode:MPRouteDiscoveryModeDisabled];
- _airPlayPresenceRoutingController = nil;
</del><ins>+ LOG(Media, "-[WebMediaSessionHelper stopMonitoringAirPlayRoutes]");
+
+ RetainPtr<WebMediaSessionHelper> strongSelf = self;
+ callOnMainThread([strongSelf] () {
+ LOG(Media, "-[WebMediaSessionHelper stopMonitoringAirPlayRoutes] - dipatched to MainThread");
+
+ if (!strongSelf->_airPlayPresenceRoutingController)
+ return;
+
+ [strongSelf->_airPlayPresenceRoutingController setDiscoveryMode:MPRouteDiscoveryModeDisabled];
+ strongSelf->_airPlayPresenceRoutingController = nil;
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)interruption:(NSNotification *)notification
</span><span class="lines">@@ -289,6 +338,8 @@
</span><span class="cx"> NSUInteger type = [[[notification userInfo] objectForKey:AVAudioSessionInterruptionTypeKey] unsignedIntegerValue];
</span><span class="cx"> MediaSession::EndInterruptionFlags flags = MediaSession::NoFlags;
</span><span class="cx">
</span><ins>+ LOG(Media, "-[WebMediaSessionHelper interruption] - type = %i", (int)type);
+
</ins><span class="cx"> if (type == AVAudioSessionInterruptionTypeEnded && [[[notification userInfo] objectForKey:AVAudioSessionInterruptionOptionKey] unsignedIntegerValue] == AVAudioSessionInterruptionOptionShouldResume)
</span><span class="cx"> flags = MediaSession::MayResumePlaying;
</span><span class="cx">
</span><span class="lines">@@ -311,6 +362,8 @@
</span><span class="cx"> if (!_callback)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ LOG(Media, "-[WebMediaSessionHelper applicationWillEnterForeground]");
+
</ins><span class="cx"> WebThreadRun(^{
</span><span class="cx"> if (!_callback)
</span><span class="cx"> return;
</span><span class="lines">@@ -326,6 +379,8 @@
</span><span class="cx"> if (!_callback)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ LOG(Media, "-[WebMediaSessionHelper applicationDidBecomeActive]");
+
</ins><span class="cx"> WebThreadRun(^{
</span><span class="cx"> if (!_callback)
</span><span class="cx"> return;
</span><span class="lines">@@ -340,7 +395,9 @@
</span><span class="cx">
</span><span class="cx"> if (!_callback)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
+ LOG(Media, "-[WebMediaSessionHelper applicationWillResignActive]");
+
</ins><span class="cx"> WebThreadRun(^{
</span><span class="cx"> if (!_callback)
</span><span class="cx"> return;
</span><span class="lines">@@ -356,6 +413,8 @@
</span><span class="cx"> if (!_callback)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ LOG(Media, "-[WebMediaSessionHelper wirelessRoutesAvailableDidChange]");
+
</ins><span class="cx"> WebThreadRun(^{
</span><span class="cx"> if (!_callback)
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>