<!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>[186016] 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/186016">186016</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-06-26 16:33:21 -0700 (Fri, 26 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Muted videos should not automatically play to AppleTV
https://bugs.webkit.org/show_bug.cgi?id=146366
Reviewed by Dean Jackson.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::HTMLMediaElement): Initialize m_initiallyMuted.
(WebCore::HTMLMediaElement::scheduleDelayedAction): Support CheckMediaState.
(WebCore::HTMLMediaElement::setReadyState): Set m_initiallyMuted to true if the element is
muted or the volume is less than 5%.
(WebCore::HTMLMediaElement::setMuted): Update media state asynchronously so multiple state
changes can be coalesced.
(WebCore::HTMLMediaElement::mediaPlayerEngineUpdated): Ditto.
(WebCore::HTMLMediaElement::setPlaying): Ditto.
(WebCore::HTMLMediaElement::mediaPlayerCurrentPlaybackTargetIsWirelessChanged): Ditto.
(WebCore::HTMLMediaElement::removeEventListener): Ditto.
(WebCore::HTMLMediaElement::enqueuePlaybackTargetAvailabilityChangedEvent): Ditto.
(WebCore::HTMLMediaElement::updateMediaState): Update after a timer when passed UpdateMediaState::Asynchronously.
(WebCore::HTMLMediaElement::mediaState): Don't set the ExternalDeviceAutoPlayCandidate flag if
m_initiallyMuted is true.
* html/HTMLMediaElement.h:
* html/HTMLMediaElementEnums.h:</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="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementEnumsh">trunk/Source/WebCore/html/HTMLMediaElementEnums.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186015 => 186016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-26 22:55:17 UTC (rev 186015)
+++ trunk/Source/WebCore/ChangeLog 2015-06-26 23:33:21 UTC (rev 186016)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-06-26 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] Muted videos should not automatically play to AppleTV
+ https://bugs.webkit.org/show_bug.cgi?id=146366
+
+ Reviewed by Dean Jackson.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::HTMLMediaElement): Initialize m_initiallyMuted.
+ (WebCore::HTMLMediaElement::scheduleDelayedAction): Support CheckMediaState.
+ (WebCore::HTMLMediaElement::setReadyState): Set m_initiallyMuted to true if the element is
+ muted or the volume is less than 5%.
+ (WebCore::HTMLMediaElement::setMuted): Update media state asynchronously so multiple state
+ changes can be coalesced.
+ (WebCore::HTMLMediaElement::mediaPlayerEngineUpdated): Ditto.
+ (WebCore::HTMLMediaElement::setPlaying): Ditto.
+ (WebCore::HTMLMediaElement::mediaPlayerCurrentPlaybackTargetIsWirelessChanged): Ditto.
+ (WebCore::HTMLMediaElement::removeEventListener): Ditto.
+ (WebCore::HTMLMediaElement::enqueuePlaybackTargetAvailabilityChangedEvent): Ditto.
+ (WebCore::HTMLMediaElement::updateMediaState): Update after a timer when passed UpdateMediaState::Asynchronously.
+ (WebCore::HTMLMediaElement::mediaState): Don't set the ExternalDeviceAutoPlayCandidate flag if
+ m_initiallyMuted is true.
+ * html/HTMLMediaElement.h:
+ * html/HTMLMediaElementEnums.h:
+
</ins><span class="cx"> 2015-06-26 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Rolling out r184660
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (186015 => 186016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-06-26 22:55:17 UTC (rev 186015)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-06-26 23:33:21 UTC (rev 186016)
</span><span class="lines">@@ -326,6 +326,7 @@
</span><span class="cx"> , m_autoplaying(true)
</span><span class="cx"> , m_muted(false)
</span><span class="cx"> , m_explicitlyMuted(false)
</span><ins>+ , m_initiallyMuted(false)
</ins><span class="cx"> , m_paused(true)
</span><span class="cx"> , m_seeking(false)
</span><span class="cx"> , m_sentStalledEvent(false)
</span><span class="lines">@@ -758,6 +759,9 @@
</span><span class="cx"> setFlags(m_pendingActionFlags, CheckPlaybackTargetCompatablity);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ if (actionType & CheckMediaState)
+ setFlags(m_pendingActionFlags, CheckMediaState);
+
</ins><span class="cx"> m_pendingActionTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -807,6 +811,9 @@
</span><span class="cx"> LOG(Media, "HTMLMediaElement::pendingActionTimerFired(%p) - calling setShouldPlayToPlaybackTarget(false)", this);
</span><span class="cx"> m_player->setShouldPlayToPlaybackTarget(false);
</span><span class="cx"> }
</span><ins>+
+ if (m_pendingActionFlags & CheckMediaState)
+ updateMediaState();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_pendingActionFlags = 0;
</span><span class="lines">@@ -2068,7 +2075,8 @@
</span><span class="cx"> if (hasEventListeners(eventNames().webkitplaybacktargetavailabilitychangedEvent))
</span><span class="cx"> enqueuePlaybackTargetAvailabilityChangedEvent();
</span><span class="cx"> #endif
</span><del>-
</del><ins>+ m_initiallyMuted = m_volume < 0.05 || muted();
+
</ins><span class="cx"> if (hasMediaControls())
</span><span class="cx"> mediaControls()->loadedMetadata();
</span><span class="cx"> if (renderer())
</span><span class="lines">@@ -3087,7 +3095,7 @@
</span><span class="cx"> document().updateIsPlayingMedia();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- updateMediaState();
</del><ins>+ updateMediaState(UpdateMediaState::Asynchronously);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -4402,7 +4410,7 @@
</span><span class="cx"> m_player->setVideoFullscreenLayer(m_videoFullscreenLayer.get());
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- updateMediaState();
</del><ins>+ updateMediaState(UpdateMediaState::Asynchronously);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4700,7 +4708,7 @@
</span><span class="cx"> document().updateIsPlayingMedia();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- updateMediaState();
</del><ins>+ updateMediaState(UpdateMediaState::Asynchronously);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4963,7 +4971,7 @@
</span><span class="cx">
</span><span class="cx"> configureMediaControls();
</span><span class="cx"> scheduleEvent(eventNames().webkitcurrentplaybacktargetiswirelesschangedEvent);
</span><del>- updateMediaState();
</del><ins>+ updateMediaState(UpdateMediaState::Asynchronously);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLMediaElement::dispatchEvent(PassRefPtr<Event> prpEvent)
</span><span class="lines">@@ -5007,7 +5015,7 @@
</span><span class="cx"> if (didRemoveLastAvailabilityChangedListener) {
</span><span class="cx"> m_hasPlaybackTargetAvailabilityListeners = false;
</span><span class="cx"> m_mediaSession->setHasPlaybackTargetAvailabilityListeners(*this, false);
</span><del>- updateMediaState();
</del><ins>+ updateMediaState(UpdateMediaState::Asynchronously);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -5020,7 +5028,7 @@
</span><span class="cx"> RefPtr<Event> event = WebKitPlaybackTargetAvailabilityEvent::create(eventNames().webkitplaybacktargetavailabilitychangedEvent, hasTargets);
</span><span class="cx"> event->setTarget(this);
</span><span class="cx"> m_asyncEventQueue.enqueueEvent(event.release());
</span><del>- updateMediaState();
</del><ins>+ updateMediaState(UpdateMediaState::Asynchronously);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&& device)
</span><span class="lines">@@ -6295,8 +6303,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>-void HTMLMediaElement::updateMediaState()
</del><ins>+void HTMLMediaElement::updateMediaState(UpdateMediaState updateState)
</ins><span class="cx"> {
</span><ins>+ if (updateState == UpdateMediaState::Asynchronously) {
+ scheduleDelayedAction(CheckMediaState);
+ return;
+ }
+
</ins><span class="cx"> MediaProducer::MediaStateFlags state = mediaState();
</span><span class="cx"> if (m_mediaState == state)
</span><span class="cx"> return;
</span><span class="lines">@@ -6321,7 +6334,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 || (hasAudio && !loop())))
</del><ins>+ if (hasActiveVideo && (!requireUserGesture || (hasAudio && !m_initiallyMuted && !loop())))
</ins><span class="cx"> state |= ExternalDeviceAutoPlayCandidate;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (186015 => 186016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2015-06-26 22:55:17 UTC (rev 186015)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2015-06-26 23:33:21 UTC (rev 186016)
</span><span class="lines">@@ -725,7 +725,12 @@
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> virtual void documentWillSuspendForPageCache() override final;
</span><span class="cx"> virtual void documentDidResumeFromPageCache() override final;
</span><del>- void updateMediaState();
</del><ins>+
+ enum class UpdateMediaState {
+ Asynchronously,
+ Synchronously,
+ };
+ void updateMediaState(UpdateMediaState updateState = UpdateMediaState::Synchronously);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> Timer m_pendingActionTimer;
</span><span class="lines">@@ -837,6 +842,7 @@
</span><span class="cx"> bool m_autoplaying : 1;
</span><span class="cx"> bool m_muted : 1;
</span><span class="cx"> bool m_explicitlyMuted : 1;
</span><ins>+ bool m_initiallyMuted : 1;
</ins><span class="cx"> bool m_paused : 1;
</span><span class="cx"> bool m_seeking : 1;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementEnumsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElementEnums.h (186015 => 186016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElementEnums.h 2015-06-26 22:55:17 UTC (rev 186015)
+++ trunk/Source/WebCore/html/HTMLMediaElementEnums.h 2015-06-26 23:33:21 UTC (rev 186016)
</span><span class="lines">@@ -40,8 +40,9 @@
</span><span class="cx"> TextTrackChangesNotification = 1 << 2,
</span><span class="cx"> ConfigureTextTrackDisplay = 1 << 3,
</span><span class="cx"> CheckPlaybackTargetCompatablity = 1 << 4,
</span><ins>+ CheckMediaState = 1 << 5,
</ins><span class="cx">
</span><del>- EveryDelayedAction = LoadMediaResource | ConfigureTextTracks | TextTrackChangesNotification | ConfigureTextTrackDisplay | CheckPlaybackTargetCompatablity,
</del><ins>+ EveryDelayedAction = LoadMediaResource | ConfigureTextTracks | TextTrackChangesNotification | ConfigureTextTrackDisplay | CheckPlaybackTargetCompatablity | CheckMediaState,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum ReadyState { HAVE_NOTHING, HAVE_METADATA, HAVE_CURRENT_DATA, HAVE_FUTURE_DATA, HAVE_ENOUGH_DATA };
</span></span></pre>
</div>
</div>
</body>
</html>