<!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>[183751] 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/183751">183751</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-05-04 11:26:00 -0700 (Mon, 04 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Show wireless playback placard even when an element has custom controls
https://bugs.webkit.org/show_bug.cgi?id=144548
Reviewed by Brent Fulgham.
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.shouldHaveAnyUI): Return true when playing to wireless target.
(Controller.prototype.reconnectControls): Add controls when playing to wireless target.
(Controller.prototype.setPlaying): Return early when there is no 'controls' attribute.
(Controller.prototype.showControls): Ditto.
(Controller.prototype.updateWirelessPlaybackStatus): Call updateBase when playing to wireless
target to ensure that controls have been set up.
(Controller.prototype.handleWirelessPlaybackChange): Call reconnectControls when playing
to wireless target when there is no 'controls' attribute.
(Controller.prototype.showInlinePlaybackPlaceholderOnly): New.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::mediaPlayerCurrentPlaybackTargetIsWirelessChanged): Call configureMediaControls.
(WebCore::HTMLMediaElement::configureMediaControls): Require controls when playing
to wireless target.
(WebCore::HTMLMediaElement::configureTextTrackDisplay): Remove some unhelpful, noisy, logging.</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183750 => 183751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-04 18:24:19 UTC (rev 183750)
+++ trunk/Source/WebCore/ChangeLog 2015-05-04 18:26:00 UTC (rev 183751)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-05-04 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] Show wireless playback placard even when an element has custom controls
+ https://bugs.webkit.org/show_bug.cgi?id=144548
+
+ Reviewed by Brent Fulgham.
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.shouldHaveAnyUI): Return true when playing to wireless target.
+ (Controller.prototype.reconnectControls): Add controls when playing to wireless target.
+ (Controller.prototype.setPlaying): Return early when there is no 'controls' attribute.
+ (Controller.prototype.showControls): Ditto.
+ (Controller.prototype.updateWirelessPlaybackStatus): Call updateBase when playing to wireless
+ target to ensure that controls have been set up.
+ (Controller.prototype.handleWirelessPlaybackChange): Call reconnectControls when playing
+ to wireless target when there is no 'controls' attribute.
+ (Controller.prototype.showInlinePlaybackPlaceholderOnly): New.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::mediaPlayerCurrentPlaybackTargetIsWirelessChanged): Call configureMediaControls.
+ (WebCore::HTMLMediaElement::configureMediaControls): Require controls when playing
+ to wireless target.
+ (WebCore::HTMLMediaElement::configureTextTrackDisplay): Remove some unhelpful, noisy, logging.
+
</ins><span class="cx"> 2015-05-04 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Fixed the build.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (183750 => 183751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-05-04 18:24:19 UTC (rev 183750)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-05-04 18:26:00 UTC (rev 183751)
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx">
</span><span class="cx"> shouldHaveAnyUI: function()
</span><span class="cx"> {
</span><del>- return this.shouldHaveControls() || (this.video.textTracks && this.video.textTracks.length);
</del><ins>+ return this.shouldHaveControls() || (this.video.textTracks && this.video.textTracks.length) || this.currentPlaybackTargetIsWireless();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> shouldHaveControls: function()
</span><span class="lines">@@ -506,8 +506,7 @@
</span><span class="cx"> this.configureInlineControls();
</span><span class="cx"> else if (this.controlsType == Controller.FullScreenControls)
</span><span class="cx"> this.configureFullScreenControls();
</span><del>-
- if (this.shouldHaveControls())
</del><ins>+ if (this.shouldHaveControls() || this.currentPlaybackTargetIsWireless())
</ins><span class="cx"> this.addControls();
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -1302,6 +1301,9 @@
</span><span class="cx">
</span><span class="cx"> setPlaying: function(isPlaying)
</span><span class="cx"> {
</span><ins>+ if (this.showInlinePlaybackPlaceholderOnly())
+ return;
+
</ins><span class="cx"> if (this.isPlaying === isPlaying)
</span><span class="cx"> return;
</span><span class="cx"> this.isPlaying = isPlaying;
</span><span class="lines">@@ -1325,22 +1327,22 @@
</span><span class="cx">
</span><span class="cx"> showControls: function()
</span><span class="cx"> {
</span><ins>+ this.updateShouldListenForPlaybackTargetAvailabilityEvent();
+ if (this.showInlinePlaybackPlaceholderOnly())
+ return;
+
</ins><span class="cx"> this.setNeedsTimelineMetricsUpdate();
</span><del>-
</del><span class="cx"> this.updateTime(true);
</span><span class="cx"> this.updateProgress(true);
</span><span class="cx"> this.drawVolumeBackground();
</span><span class="cx"> this.drawTimelineBackground();
</span><del>-
</del><span class="cx"> this.controls.panel.classList.add(this.ClassNames.show);
</span><span class="cx"> this.controls.panel.classList.remove(this.ClassNames.hidden);
</span><del>-
</del><ins>+
</ins><span class="cx"> if (this.controls.panelBackground) {
</span><span class="cx"> this.controls.panelBackground.classList.add(this.ClassNames.show);
</span><span class="cx"> this.controls.panelBackground.classList.remove(this.ClassNames.hidden);
</span><span class="cx"> }
</span><del>-
- this.updateShouldListenForPlaybackTargetAvailabilityEvent();
</del><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> hideControls: function()
</span><span class="lines">@@ -1816,6 +1818,7 @@
</span><span class="cx"> this.controls.volumeBox.style.display = "none";
</span><span class="cx"> else
</span><span class="cx"> this.controls.muteBox.style.display = "none";
</span><ins>+ this.updateBase();
</ins><span class="cx"> this.showControls();
</span><span class="cx"> } else {
</span><span class="cx"> this.controls.inlinePlaybackPlaceholder.classList.add(this.ClassNames.hidden);
</span><span class="lines">@@ -1851,6 +1854,8 @@
</span><span class="cx"> this.updateWirelessTargetAvailable();
</span><span class="cx"> this.updateWirelessPlaybackStatus();
</span><span class="cx"> this.setNeedsTimelineMetricsUpdate();
</span><ins>+ if (this.showInlinePlaybackPlaceholderOnly())
+ this.reconnectControls();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleWirelessTargetAvailableChange: function(event) {
</span><span class="lines">@@ -1876,4 +1881,10 @@
</span><span class="cx"> else
</span><span class="cx"> this.stopListeningFor(this.video, 'webkitplaybacktargetavailabilitychanged', this.handleWirelessTargetAvailableChange);
</span><span class="cx"> },
</span><ins>+
+ showInlinePlaybackPlaceholderOnly: function(event)
+ {
+ return this.currentPlaybackTargetIsWireless() && !this.video.controls;
+ },
+
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (183750 => 183751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-05-04 18:24:19 UTC (rev 183750)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-05-04 18:26:00 UTC (rev 183751)
</span><span class="lines">@@ -4869,8 +4869,9 @@
</span><span class="cx"> void HTMLMediaElement::mediaPlayerCurrentPlaybackTargetIsWirelessChanged(MediaPlayer*)
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "HTMLMediaElement::mediaPlayerCurrentPlaybackTargetIsWirelessChanged(%p) - webkitCurrentPlaybackTargetIsWireless = %s", this, boolString(webkitCurrentPlaybackTargetIsWireless()));
</span><ins>+
+ configureMediaControls();
</ins><span class="cx"> scheduleEvent(eventNames().webkitcurrentplaybacktargetiswirelesschangedEvent);
</span><del>-
</del><span class="cx"> m_mediaSession->mediaStateDidChange(*this, mediaState());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5337,6 +5338,11 @@
</span><span class="cx"> if (isFullscreen())
</span><span class="cx"> requireControls = true;
</span><span class="cx">
</span><ins>+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+ if (m_player && m_player->isCurrentPlaybackTargetWireless())
+ requireControls = true;
+#endif
+
</ins><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><span class="cx"> if (!requireControls || !inDocument() || !inActiveDocument())
</span><span class="cx"> return;
</span><span class="lines">@@ -5364,11 +5370,8 @@
</span><span class="cx"> if (m_processingPreferenceChange)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- LOG(Media, "HTMLMediaElement::configureTextTrackDisplay(%p) - checkType = %s", this, checkType == CheckTextTrackVisibility ? "check-visibility" : "assume-visibility-changed");
-
</del><span class="cx"> bool haveVisibleTextTrack = false;
</span><span class="cx"> for (unsigned i = 0; i < m_textTracks->length(); ++i) {
</span><del>- LOG(Media, " track[%i]->mode = %s", i, String(m_textTracks->item(i)->mode()).utf8().data());
</del><span class="cx"> if (m_textTracks->item(i)->mode() == TextTrack::showingKeyword()) {
</span><span class="cx"> haveVisibleTextTrack = true;
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>