<!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>[202918] 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/202918">202918</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-07-07 11:00:49 -0700 (Thu, 07 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Facebook videos without audio tracks will sometimes cause playback controls to appear.
https://bugs.webkit.org/show_bug.cgi?id=159437
Reviewed by Eric Carlson.
Because updatePlaybackControlsManager() will cause the session manager to walk through all
the outstanding sessions asking if it canControlControlsManager(), some sessions will say
they can control the controls manager if we are currently processing a user gesture. This is
obviously not intended (there may be a user gesture to un-mute video 1, but an unrelated
video 2 should not be allowed to use that use gesture to fulfill its own requirements.)
So in those situations where conditions may have changed and updatePlaybackControlsManager()
needs to be called, instead schedule the update for the next run loop.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::setMuted):
(WebCore::HTMLMediaElement::layoutSizeChanged):
(WebCore::HTMLMediaElement::updatePlayState):
(WebCore::HTMLMediaElement::createMediaPlayer):
(WebCore::HTMLMediaElement::scheduleUpdatePlaybackControlsManager):
* html/HTMLMediaElement.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202917 => 202918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-07 17:30:14 UTC (rev 202917)
+++ trunk/Source/WebCore/ChangeLog 2016-07-07 18:00:49 UTC (rev 202918)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-07-05 Jer Noble <jer.noble@apple.com>
+
+ Facebook videos without audio tracks will sometimes cause playback controls to appear.
+ https://bugs.webkit.org/show_bug.cgi?id=159437
+
+ Reviewed by Eric Carlson.
+
+ Because updatePlaybackControlsManager() will cause the session manager to walk through all
+ the outstanding sessions asking if it canControlControlsManager(), some sessions will say
+ they can control the controls manager if we are currently processing a user gesture. This is
+ obviously not intended (there may be a user gesture to un-mute video 1, but an unrelated
+ video 2 should not be allowed to use that use gesture to fulfill its own requirements.)
+
+ So in those situations where conditions may have changed and updatePlaybackControlsManager()
+ needs to be called, instead schedule the update for the next run loop.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::setMuted):
+ (WebCore::HTMLMediaElement::layoutSizeChanged):
+ (WebCore::HTMLMediaElement::updatePlayState):
+ (WebCore::HTMLMediaElement::createMediaPlayer):
+ (WebCore::HTMLMediaElement::scheduleUpdatePlaybackControlsManager):
+ * html/HTMLMediaElement.h:
+
</ins><span class="cx"> 2016-07-07 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix after r202908. Fix the webPlaybackSessionInterfaceMac @property.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (202917 => 202918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-07-07 17:30:14 UTC (rev 202917)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-07-07 18:00:49 UTC (rev 202918)
</span><span class="lines">@@ -563,6 +563,7 @@
</span><span class="cx"> m_seekTaskQueue.close();
</span><span class="cx"> m_promiseTaskQueue.close();
</span><span class="cx"> m_pauseAfterDetachedTaskQueue.close();
</span><ins>+ m_updatePlaybackControlsManagerQueue.close();
</ins><span class="cx">
</span><span class="cx"> m_completelyLoaded = true;
</span><span class="cx">
</span><span class="lines">@@ -3368,7 +3369,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updatePlaybackControlsManager();
</del><ins>+ scheduleUpdatePlaybackControlsManager();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::togglePlayState()
</span><span class="lines">@@ -4013,7 +4014,7 @@
</span><span class="cx">
</span><span class="cx"> if (!m_receivedLayoutSizeChanged) {
</span><span class="cx"> m_receivedLayoutSizeChanged = true;
</span><del>- updatePlaybackControlsManager();
</del><ins>+ scheduleUpdatePlaybackControlsManager();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4861,7 +4862,7 @@
</span><span class="cx"> LOG(Media, "HTMLMediaElement::updatePlayState(%p) - shouldBePlaying = %s, playerPaused = %s", this, boolString(shouldBePlaying), boolString(playerPaused));
</span><span class="cx">
</span><span class="cx"> if (shouldBePlaying) {
</span><del>- updatePlaybackControlsManager();
</del><ins>+ scheduleUpdatePlaybackControlsManager();
</ins><span class="cx">
</span><span class="cx"> setDisplayMode(Video);
</span><span class="cx"> invalidateCachedTime();
</span><span class="lines">@@ -4895,7 +4896,7 @@
</span><span class="cx"> startPlaybackProgressTimer();
</span><span class="cx"> setPlaying(true);
</span><span class="cx"> } else {
</span><del>- updatePlaybackControlsManager();
</del><ins>+ scheduleUpdatePlaybackControlsManager();
</ins><span class="cx">
</span><span class="cx"> if (!playerPaused)
</span><span class="cx"> m_player->pause();
</span><span class="lines">@@ -5093,6 +5094,7 @@
</span><span class="cx"> m_shadowDOMTaskQueue.close();
</span><span class="cx"> m_promiseTaskQueue.close();
</span><span class="cx"> m_pauseAfterDetachedTaskQueue.close();
</span><ins>+ m_updatePlaybackControlsManagerQueue.close();
</ins><span class="cx">
</span><span class="cx"> ActiveDOMObject::contextDestroyed();
</span><span class="cx"> }
</span><span class="lines">@@ -5106,6 +5108,7 @@
</span><span class="cx">
</span><span class="cx"> m_asyncEventQueue.close();
</span><span class="cx"> m_promiseTaskQueue.close();
</span><ins>+ m_updatePlaybackControlsManagerQueue.close();
</ins><span class="cx">
</span><span class="cx"> // Once an active DOM object has been stopped it can not be restarted, so we can deallocate
</span><span class="cx"> // the media player now. Note that userCancelledLoad will already called clearMediaPlayer
</span><span class="lines">@@ -5956,7 +5959,7 @@
</span><span class="cx"> forgetResourceSpecificTracks();
</span><span class="cx"> #endif
</span><span class="cx"> m_player = std::make_unique<MediaPlayer>(static_cast<MediaPlayerClient&>(*this));
</span><del>- updatePlaybackControlsManager();
</del><ins>+ scheduleUpdatePlaybackControlsManager();
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_AUDIO)
</span><span class="cx"> if (m_audioSourceNode) {
</span><span class="lines">@@ -7120,6 +7123,12 @@
</span><span class="cx"> page->chrome().client().setUpPlaybackControlsManager(downcast<MediaElementSession>(session)->element());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void HTMLMediaElement::scheduleUpdatePlaybackControlsManager()
+{
+ if (!m_updatePlaybackControlsManagerQueue.hasPendingTasks())
+ m_updatePlaybackControlsManagerQueue.enqueueTask(std::bind(&HTMLMediaElement::updatePlaybackControlsManager, this));
+}
+
</ins><span class="cx"> bool HTMLMediaElement::shouldOverrideBackgroundLoadingRestriction() const
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (202917 => 202918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2016-07-07 17:30:14 UTC (rev 202917)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2016-07-07 18:00:49 UTC (rev 202918)
</span><span class="lines">@@ -781,6 +781,7 @@
</span><span class="cx">
</span><span class="cx"> void pauseAfterDetachedTask();
</span><span class="cx"> void updatePlaybackControlsManager();
</span><ins>+ void scheduleUpdatePlaybackControlsManager();
</ins><span class="cx">
</span><span class="cx"> void updateRenderer();
</span><span class="cx">
</span><span class="lines">@@ -797,6 +798,7 @@
</span><span class="cx"> GenericTaskQueue<Timer> m_shadowDOMTaskQueue;
</span><span class="cx"> GenericTaskQueue<Timer> m_promiseTaskQueue;
</span><span class="cx"> GenericTaskQueue<Timer> m_pauseAfterDetachedTaskQueue;
</span><ins>+ GenericTaskQueue<Timer> m_updatePlaybackControlsManagerQueue;
</ins><span class="cx"> RefPtr<TimeRanges> m_playedTimeRanges;
</span><span class="cx"> GenericEventQueue m_asyncEventQueue;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>