<!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>[187892] 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/187892">187892</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-08-04 14:46:40 -0700 (Tue, 04 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Do not require a video track for AirPlay
https://bugs.webkit.org/show_bug.cgi?id=147647
Reviewed by Jer Noble.
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.handleReadyStateChange): Call updateWirelessTargetAvailable().
(Controller.prototype.updateHasVideo): Don't call updateWirelessTargetAvailable().
(Controller.prototype.updateWirelessTargetAvailable): Don't require video.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::setReadyState): Call updateMediaState when we reach HAVE_METADATA.
(WebCore::HTMLMediaElement::mediaState): Don't require video, only that the file can play.
* html/MediaElementSession.cpp:
(WebCore::MediaElementSession::showPlaybackTargetPicker): Check readyState instead of hasVideo.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaElementSessioncpp">trunk/Source/WebCore/html/MediaElementSession.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187891 => 187892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-04 21:41:02 UTC (rev 187891)
+++ trunk/Source/WebCore/ChangeLog 2015-08-04 21:46:40 UTC (rev 187892)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-08-04 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] Do not require a video track for AirPlay
+ https://bugs.webkit.org/show_bug.cgi?id=147647
+
+ Reviewed by Jer Noble.
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.handleReadyStateChange): Call updateWirelessTargetAvailable().
+ (Controller.prototype.updateHasVideo): Don't call updateWirelessTargetAvailable().
+ (Controller.prototype.updateWirelessTargetAvailable): Don't require video.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::setReadyState): Call updateMediaState when we reach HAVE_METADATA.
+ (WebCore::HTMLMediaElement::mediaState): Don't require video, only that the file can play.
+
+ * html/MediaElementSession.cpp:
+ (WebCore::MediaElementSession::showPlaybackTargetPicker): Check readyState instead of hasVideo.
+
</ins><span class="cx"> 2015-08-04 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of ReasonForCallingAllowPlugins since it's not used anywhere
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (187891 => 187892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-08-04 21:41:02 UTC (rev 187891)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-08-04 21:46:40 UTC (rev 187892)
</span><span class="lines">@@ -688,6 +688,7 @@
</span><span class="cx"> this.updateCaptionButton();
</span><span class="cx"> this.updateCaptionContainer();
</span><span class="cx"> this.updateFullscreenButtons();
</span><ins>+ this.updateWirelessTargetAvailable();
</ins><span class="cx"> this.updateWirelessTargetPickerButton();
</span><span class="cx"> this.updateProgress();
</span><span class="cx"> this.updateControls();
</span><span class="lines">@@ -1870,9 +1871,6 @@
</span><span class="cx"> this.controls.panel.classList.remove(this.ClassNames.noVideo);
</span><span class="cx"> else
</span><span class="cx"> this.controls.panel.classList.add(this.ClassNames.noVideo);
</span><del>-
- // The wireless target picker is only visible for files with video, force an update.
- this.updateWirelessTargetAvailable();
</del><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> updateVolume: function()
</span><span class="lines">@@ -1986,7 +1984,7 @@
</span><span class="cx"> if (this.wirelessPlaybackDisabled)
</span><span class="cx"> wirelessPlaybackTargetsAvailable = false;
</span><span class="cx">
</span><del>- if (wirelessPlaybackTargetsAvailable && this.isPlayable() && this.hasVideo())
</del><ins>+ if (wirelessPlaybackTargetsAvailable && this.isPlayable())
</ins><span class="cx"> this.controls.wirelessTargetPicker.classList.remove(this.ClassNames.hidden);
</span><span class="cx"> else
</span><span class="cx"> this.controls.wirelessTargetPicker.classList.add(this.ClassNames.hidden);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (187891 => 187892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-08-04 21:41:02 UTC (rev 187891)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-08-04 21:46:40 UTC (rev 187892)
</span><span class="lines">@@ -2143,6 +2143,10 @@
</span><span class="cx"> downcast<MediaDocument>(document()).mediaElementNaturalSizeChanged(expandedIntSize(m_player->naturalSize()));
</span><span class="cx">
</span><span class="cx"> logMediaLoadRequest(document().page(), m_player->engineDescription(), String(), true);
</span><ins>+
+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+ updateMediaState(UpdateMediaState::Asynchronously);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool shouldUpdateDisplayState = false;
</span><span class="lines">@@ -6466,7 +6470,7 @@
</span><span class="cx"> state |= RequiresPlaybackTargetMonitoring;
</span><span class="cx">
</span><span class="cx"> bool requireUserGesture = m_mediaSession->hasBehaviorRestriction(MediaElementSession::RequireUserGestureToAutoplayToExternalDevice);
</span><del>- if (hasActiveVideo && !requireUserGesture && !m_failedToPlayToWirelessTarget)
</del><ins>+ if (m_readyState >= HAVE_METADATA && !requireUserGesture && !m_failedToPlayToWirelessTarget)
</ins><span class="cx"> state |= ExternalDeviceAutoPlayCandidate;
</span><span class="cx">
</span><span class="cx"> if (hasActiveVideo && endedPlayback())
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaElementSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (187891 => 187892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaElementSession.cpp 2015-08-04 21:41:02 UTC (rev 187891)
+++ trunk/Source/WebCore/html/MediaElementSession.cpp 2015-08-04 21:46:40 UTC (rev 187892)
</span><span class="lines">@@ -200,8 +200,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>- if (!element.hasVideo()) {
- LOG(Media, "MediaElementSession::showPlaybackTargetPicker - returning early because element has no video");
</del><ins>+ if (element.readyState() < HTMLMediaElementEnums::HAVE_METADATA) {
+ LOG(Media, "MediaElementSession::showPlaybackTargetPicker - returning early because element is not playable");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>