<!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>[174872] branches/safari-600.1.4.12-branch/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/174872">174872</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-10-19 10:44:09 -0700 (Sun, 19 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/174651">r174651</a>. <rdar://problem/18576904></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001412branchSourceWebCoreChangeLog">branches/safari-600.1.4.12-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001412branchSourceWebCoreModulesmediacontrolsmediaControlsiOSjs">branches/safari-600.1.4.12-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
<li><a href="#branchessafari6001412branchSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm">branches/safari-600.1.4.12-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001412branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.12-branch/Source/WebCore/ChangeLog (174871 => 174872)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.12-branch/Source/WebCore/ChangeLog 2014-10-19 17:40:09 UTC (rev 174871)
+++ branches/safari-600.1.4.12-branch/Source/WebCore/ChangeLog 2014-10-19 17:44:09 UTC (rev 174872)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2014-10-19 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r174651.
+
+ 2014-10-13 Jer Noble <jer.noble@apple.com>
+
+ [iOS] Stop listening for wireless playback target availability when the default controls are hidden.
+ https://bugs.webkit.org/show_bug.cgi?id=137633
+
+ Reviewed by Dean Jackson.
+
+ In order to minimize the excess bandwidth and power consumption required for actively listening
+ for wireless playback target availablity, unregister for those notifications while the controls
+ are hidden due to playback, or when the element's document is hidden.
+
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.createBase): Register for document visiblity change notfications.
+ (ControllerIOS.prototype.setControlsType): Call updateShouldListenForPlaybackTargetAvailabilityEvent()
+ instead of setShouldListenForPlaybackTargetAvailabilityEvent()
+ (ControllerIOS.prototype.hideControls): Ditto.
+ (ControllerIOS.prototype.showControls): Ditto.
+ (ControllerIOS.prototype.updateStatusDisplay): Ditto.
+ (ControllerIOS.prototype.handleVisibilityChange): Ditto.
+ (ControllerIOS.prototype.updateShouldListenForPlaybackTargetAvailabilityEvent): Added. Only listen
+ for target availability when the video has no errors, is not in the initial "big play button"
+ controls state, and when the controls are not hidden.
+ * platform/audio/ios/MediaSessionManagerIOS.mm:
+ (-[WebMediaSessionHelper stopMonitoringAirPlayRoutes]): Explicitly set the discoveryMode to "disabled"
+ rather than waiting for the autoreleasepool to destroy our routing controller.
+
+2014-10-19 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r174073.
</span><span class="cx">
</span><span class="cx"> 2014-09-29 Eric Carlson <eric.carlson@apple.com>
</span></span></pre></div>
<a id="branchessafari6001412branchSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.12-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (174871 => 174872)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.12-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-10-19 17:40:09 UTC (rev 174871)
+++ branches/safari-600.1.4.12-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-10-19 17:44:09 UTC (rev 174872)
</span><span class="lines">@@ -54,6 +54,8 @@
</span><span class="cx"> this.listenFor(this.base, 'touchstart', this.handleWrapperTouchStart);
</span><span class="cx"> this.stopListeningFor(this.base, 'mousemove', this.handleWrapperMouseMove);
</span><span class="cx"> this.stopListeningFor(this.base, 'mouseout', this.handleWrapperMouseOut);
</span><ins>+
+ this.listenFor(document, 'visibilitychange', this.handleVisibilityChange);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> shouldHaveStartPlaybackButton: function() {
</span><span class="lines">@@ -177,7 +179,7 @@
</span><span class="cx"> else
</span><span class="cx"> this.removeStartPlaybackControls();
</span><span class="cx">
</span><del>- this.setShouldListenForPlaybackTargetAvailabilityEvent(type !== ControllerIOS.StartPlaybackControls);
</del><ins>+ this.updateShouldListenForPlaybackTargetAvailabilityEvent();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> addStartPlaybackControls: function() {
</span><span class="lines">@@ -209,6 +211,16 @@
</span><span class="cx"> // Do nothing
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ hideControls: function() {
+ Controller.prototype.hideControls.call(this);
+ this.updateShouldListenForPlaybackTargetAvailabilityEvent();
+ },
+
+ showControls: function() {
+ Controller.prototype.showControls.call(this);
+ this.updateShouldListenForPlaybackTargetAvailabilityEvent();
+ },
+
</ins><span class="cx"> updateControls: function() {
</span><span class="cx"> if (this.shouldHaveStartPlaybackButton())
</span><span class="cx"> this.setControlsType(ControllerIOS.StartPlaybackControls);
</span><span class="lines">@@ -347,6 +359,10 @@
</span><span class="cx"> this.video.style.removeProperty('-webkit-user-select');
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ handleVisibilityChange: function(event) {
+ this.updateShouldListenForPlaybackTargetAvailabilityEvent();
+ },
+
</ins><span class="cx"> isFullScreen: function()
</span><span class="cx"> {
</span><span class="cx"> return this.video.webkitDisplayingFullscreen;
</span><span class="lines">@@ -431,10 +447,23 @@
</span><span class="cx"> return true;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ updateShouldListenForPlaybackTargetAvailabilityEvent: function() {
+ var shouldListen = true;
+ if (this.video.error)
+ shouldListen = false;
+ if (this.controlsType === ControllerIOS.StartPlaybackControls)
+ shouldListen = false;
+ if (!this.isAudio() && !this.video.paused && this.controlsAreHidden())
+ shouldListen = false;
+ if (document.hidden)
+ shouldListen = false;
+
+ this.setShouldListenForPlaybackTargetAvailabilityEvent(shouldListen);
+ },
+
</ins><span class="cx"> updateStatusDisplay: function(event)
</span><span class="cx"> {
</span><del>- if (this.video.error)
- setShouldListenForPlaybackTargetAvailabilityEvent(false);
</del><ins>+ this.updateShouldListenForPlaybackTargetAvailabilityEvent();
</ins><span class="cx"> this.controls.startPlaybackButton.classList.toggle(this.ClassNames.failed, this.video.error !== null);
</span><span class="cx"> Controller.prototype.updateStatusDisplay.call(this, event);
</span><span class="cx"> },
</span></span></pre></div>
<a id="branchessafari6001412branchSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.12-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (174871 => 174872)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.12-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2014-10-19 17:40:09 UTC (rev 174871)
+++ branches/safari-600.1.4.12-branch/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2014-10-19 17:44:09 UTC (rev 174872)
</span><span class="lines">@@ -262,6 +262,10 @@
</span><span class="cx">
</span><span class="cx"> - (void)stopMonitoringAirPlayRoutes
</span><span class="cx"> {
</span><ins>+ if (!_airPlayPresenceRoutingController)
+ return;
+
+ [_airPlayPresenceRoutingController setDiscoveryMode:MPRouteDiscoveryModeDisabled];
</ins><span class="cx"> _airPlayPresenceRoutingController = nil;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>