<!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>[174073] 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/174073">174073</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2014-09-29 11:12:13 -0700 (Mon, 29 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Optimize media controls AirPlay discovery
https://bugs.webkit.org/show_bug.cgi?id=137180
Reviewed by Darin Adler.
AirPlay discovery mode uses increases power consumption, so don't enable it when there
is no chance an AirPlay target picker will be useful.
* Modules/mediacontrols/mediaControlsiOS.js:
(ControllerIOS): Initialize isListeningForPlaybackTargetAvailabilityEvent.
(ControllerIOS.prototype.addVideoListeners): Don't enable register wireless playback event
listeners, it isn't possible to show the target picker until there is an inline controller.
(ControllerIOS.prototype.removeVideoListeners): Call setShouldListenForPlaybackTargetAvailabilityEvent.
(ControllerIOS.prototype.setControlsType): Add wireless event listers on when not showing
the one button controller.
(ControllerIOS.prototype.updateStatusDisplay): Unregister wireless event listeners when the
media element is in an error state.
(ControllerIOS.prototype.setShouldListenForPlaybackTargetAvailabilityEvent): New, add or
remove event listeners.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174072 => 174073)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-29 18:05:36 UTC (rev 174072)
+++ trunk/Source/WebCore/ChangeLog 2014-09-29 18:12:13 UTC (rev 174073)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2014-09-29 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] Optimize media controls AirPlay discovery
+ https://bugs.webkit.org/show_bug.cgi?id=137180
+
+ Reviewed by Darin Adler.
+
+ AirPlay discovery mode uses increases power consumption, so don't enable it when there
+ is no chance an AirPlay target picker will be useful.
+
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS): Initialize isListeningForPlaybackTargetAvailabilityEvent.
+ (ControllerIOS.prototype.addVideoListeners): Don't enable register wireless playback event
+ listeners, it isn't possible to show the target picker until there is an inline controller.
+ (ControllerIOS.prototype.removeVideoListeners): Call setShouldListenForPlaybackTargetAvailabilityEvent.
+ (ControllerIOS.prototype.setControlsType): Add wireless event listers on when not showing
+ the one button controller.
+ (ControllerIOS.prototype.updateStatusDisplay): Unregister wireless event listeners when the
+ media element is in an error state.
+ (ControllerIOS.prototype.setShouldListenForPlaybackTargetAvailabilityEvent): New, add or
+ remove event listeners.
+
+2014-09-29 Eric Carlson <eric.carlson@apple.com>
+
</ins><span class="cx"> [iOS] Remove obsolete playbackTargetAvailabilityChanged methods
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137179
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (174072 => 174073)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-09-29 18:05:36 UTC (rev 174072)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-09-29 18:12:13 UTC (rev 174073)
</span><span class="lines">@@ -7,6 +7,7 @@
</span><span class="cx"> {
</span><span class="cx"> this.hasWirelessPlaybackTargets = false;
</span><span class="cx"> this._pageScaleFactor = 1;
</span><ins>+ this.isListeningForPlaybackTargetAvailabilityEvent = false;
</ins><span class="cx"> Controller.call(this, root, video, host);
</span><span class="cx">
</span><span class="cx"> this.updateWirelessTargetAvailable();
</span><span class="lines">@@ -29,11 +30,6 @@
</span><span class="cx">
</span><span class="cx"> this.listenFor(this.video, 'webkitbeginfullscreen', this.handleFullscreenChange);
</span><span class="cx"> this.listenFor(this.video, 'webkitendfullscreen', this.handleFullscreenChange);
</span><del>-
- if (window.WebKitPlaybackTargetAvailabilityEvent) {
- this.listenFor(this.video, 'webkitcurrentplaybacktargetiswirelesschanged', this.handleWirelessPlaybackChange);
- this.listenFor(this.video, 'webkitplaybacktargetavailabilitychanged', this.handleWirelessTargetAvailableChange);
- }
</del><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> removeVideoListeners: function() {
</span><span class="lines">@@ -42,10 +38,7 @@
</span><span class="cx"> this.stopListeningFor(this.video, 'webkitbeginfullscreen', this.handleFullscreenChange);
</span><span class="cx"> this.stopListeningFor(this.video, 'webkitendfullscreen', this.handleFullscreenChange);
</span><span class="cx">
</span><del>- if (window.WebKitPlaybackTargetAvailabilityEvent) {
- this.stopListeningFor(this.video, 'webkitcurrentplaybacktargetiswirelesschanged', this.handleWirelessPlaybackChange);
- this.stopListeningFor(this.video, 'webkitplaybacktargetavailabilitychanged', this.handleWirelessTargetAvailableChange);
- }
</del><ins>+ this.setShouldListenForPlaybackTargetAvailabilityEvent(false);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> createBase: function() {
</span><span class="lines">@@ -180,6 +173,8 @@
</span><span class="cx"> this.addStartPlaybackControls();
</span><span class="cx"> else
</span><span class="cx"> this.removeStartPlaybackControls();
</span><ins>+
+ this.setShouldListenForPlaybackTargetAvailabilityEvent(type !== ControllerIOS.StartPlaybackControls);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> addStartPlaybackControls: function() {
</span><span class="lines">@@ -435,6 +430,8 @@
</span><span class="cx">
</span><span class="cx"> updateStatusDisplay: function(event)
</span><span class="cx"> {
</span><ins>+ if (this.video.error)
+ setShouldListenForPlaybackTargetAvailabilityEvent(false);
</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 class="lines">@@ -445,6 +442,24 @@
</span><span class="cx"> Controller.prototype.setPlaying.call(this, isPlaying);
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ setShouldListenForPlaybackTargetAvailabilityEvent: function(shouldListen)
+ {
+ if (!window.WebKitPlaybackTargetAvailabilityEvent || this.isListeningForPlaybackTargetAvailabilityEvent == shouldListen)
+ return;
+
+ if (shouldListen && (this.shouldHaveStartPlaybackButton() || this.video.error))
+ return;
+
+ this.isListeningForPlaybackTargetAvailabilityEvent = shouldListen;
+ if (shouldListen) {
+ this.listenFor(this.video, 'webkitcurrentplaybacktargetiswirelesschanged', this.handleWirelessPlaybackChange);
+ this.listenFor(this.video, 'webkitplaybacktargetavailabilitychanged', this.handleWirelessTargetAvailableChange);
+ } else {
+ this.stopListeningFor(this.video, 'webkitcurrentplaybacktargetiswirelesschanged', this.handleWirelessPlaybackChange);
+ this.stopListeningFor(this.video, 'webkitplaybacktargetavailabilitychanged', this.handleWirelessTargetAvailableChange);
+ }
+ },
+
</ins><span class="cx"> get pageScaleFactor() {
</span><span class="cx"> return this._pageScaleFactor;
</span><span class="cx"> },
</span></span></pre>
</div>
</div>
</body>
</html>