<!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>[213687] 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/213687">213687</a></dd>
<dt>Author</dt> <dd>mrajca@apple.com</dd>
<dt>Date</dt> <dd>2017-03-09 16:44:42 -0800 (Thu, 09 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Only consider autoplay interference in the first 10 seconds of playback.
https://bugs.webkit.org/show_bug.cgi?id=169455
Reviewed by Alex Christensen.
If the media duration is relatively long, say, 10 minutes, and you pause 5 minutes in, that's
probably not a strong indication users may not want auto-play. This patch limits interference
events to the first 10 seconds of automatic playback.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::setReadyState):
(WebCore::HTMLMediaElement::play):
(WebCore::HTMLMediaElement::playInternal):
(WebCore::HTMLMediaElement::pauseInternal):
(WebCore::HTMLMediaElement::setMuted):
(WebCore::HTMLMediaElement::mediaPlayerTimeChanged):
(WebCore::HTMLMediaElement::stopWithoutDestroyingMediaPlayer):
(WebCore::HTMLMediaElement::userDidInterfereWithAutoplay):
(WebCore::HTMLMediaElement::setPlaybackWithoutUserGesture):
(WebCore::HTMLMediaElement::pageMutedStateDidChange):
* 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 (213686 => 213687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-10 00:38:20 UTC (rev 213686)
+++ trunk/Source/WebCore/ChangeLog 2017-03-10 00:44:42 UTC (rev 213687)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2017-03-09 Matt Rajca <mrajca@apple.com>
+
+ Only consider autoplay interference in the first 10 seconds of playback.
+ https://bugs.webkit.org/show_bug.cgi?id=169455
+
+ Reviewed by Alex Christensen.
+
+ If the media duration is relatively long, say, 10 minutes, and you pause 5 minutes in, that's
+ probably not a strong indication users may not want auto-play. This patch limits interference
+ events to the first 10 seconds of automatic playback.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::setReadyState):
+ (WebCore::HTMLMediaElement::play):
+ (WebCore::HTMLMediaElement::playInternal):
+ (WebCore::HTMLMediaElement::pauseInternal):
+ (WebCore::HTMLMediaElement::setMuted):
+ (WebCore::HTMLMediaElement::mediaPlayerTimeChanged):
+ (WebCore::HTMLMediaElement::stopWithoutDestroyingMediaPlayer):
+ (WebCore::HTMLMediaElement::userDidInterfereWithAutoplay):
+ (WebCore::HTMLMediaElement::setPlaybackWithoutUserGesture):
+ (WebCore::HTMLMediaElement::pageMutedStateDidChange):
+ * html/HTMLMediaElement.h:
+
</ins><span class="cx"> 2017-03-09 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Add WKURLSchemeHandler API for handling custom protocols.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (213686 => 213687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2017-03-10 00:38:20 UTC (rev 213686)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2017-03-10 00:44:42 UTC (rev 213687)
</span><span class="lines">@@ -2440,12 +2440,12 @@
</span><span class="cx"> if (success) {
</span><span class="cx"> m_paused = false;
</span><span class="cx"> invalidateCachedTime();
</span><del>- m_playbackWithoutUserGesture = PlaybackWithoutUserGesture::Started;
</del><ins>+ setPlaybackWithoutUserGesture(PlaybackWithoutUserGesture::Started);
</ins><span class="cx"> m_playbackStartedTime = currentMediaTime().toDouble();
</span><span class="cx"> scheduleEvent(eventNames().playEvent);
</span><span class="cx"> scheduleNotifyAboutPlaying();
</span><span class="cx"> } else if (success.value() == MediaPlaybackDenialReason::UserGestureRequired) {
</span><del>- m_playbackWithoutUserGesture = PlaybackWithoutUserGesture::Prevented;
</del><ins>+ setPlaybackWithoutUserGesture(PlaybackWithoutUserGesture::Prevented);
</ins><span class="cx"> dispatchPlayPauseEventsIfNeedsQuirks();
</span><span class="cx">
</span><span class="cx"> if (Page* page = document().page())
</span><span class="lines">@@ -3130,7 +3130,7 @@
</span><span class="cx"> auto success = m_mediaSession->playbackPermitted(*this);
</span><span class="cx"> if (!success) {
</span><span class="cx"> if (success.value() == MediaPlaybackDenialReason::UserGestureRequired) {
</span><del>- m_playbackWithoutUserGesture = PlaybackWithoutUserGesture::Prevented;
</del><ins>+ setPlaybackWithoutUserGesture(PlaybackWithoutUserGesture::Prevented);
</ins><span class="cx"> dispatchPlayPauseEventsIfNeedsQuirks();
</span><span class="cx">
</span><span class="cx"> if (Page* page = document().page())
</span><span class="lines">@@ -3163,7 +3163,7 @@
</span><span class="cx"> auto success = m_mediaSession->playbackPermitted(*this);
</span><span class="cx"> if (!success) {
</span><span class="cx"> if (success.value() == MediaPlaybackDenialReason::UserGestureRequired) {
</span><del>- m_playbackWithoutUserGesture = PlaybackWithoutUserGesture::Prevented;
</del><ins>+ setPlaybackWithoutUserGesture(PlaybackWithoutUserGesture::Prevented);
</ins><span class="cx"> dispatchPlayPauseEventsIfNeedsQuirks();
</span><span class="cx">
</span><span class="cx"> if (Page* page = document().page())
</span><span class="lines">@@ -3239,10 +3239,10 @@
</span><span class="cx"> if (m_playbackWithoutUserGesture == PlaybackWithoutUserGesture::Prevented) {
</span><span class="cx"> if (Page* page = document().page())
</span><span class="cx"> page->chrome().client().handleAutoplayEvent(AutoplayEvent::DidPlayMediaPreventedFromPlaying);
</span><del>- m_playbackWithoutUserGesture = PlaybackWithoutUserGesture::None;
</del><ins>+ setPlaybackWithoutUserGesture(PlaybackWithoutUserGesture::None);
</ins><span class="cx"> }
</span><span class="cx"> } else
</span><del>- m_playbackWithoutUserGesture = PlaybackWithoutUserGesture::Started;
</del><ins>+ setPlaybackWithoutUserGesture(PlaybackWithoutUserGesture::Started);
</ins><span class="cx">
</span><span class="cx"> m_autoplaying = false;
</span><span class="cx"> updatePlayState();
</span><span class="lines">@@ -3284,12 +3284,10 @@
</span><span class="cx">
</span><span class="cx"> m_autoplaying = false;
</span><span class="cx">
</span><del>- if (ScriptController::processingUserGestureForMedia() && m_playbackWithoutUserGesture == PlaybackWithoutUserGesture::Started) {
- if (Page* page = document().page())
- page->chrome().client().handleAutoplayEvent(AutoplayEvent::UserDidInterfereWithPlayback);
- }
</del><ins>+ if (ScriptController::processingUserGestureForMedia())
+ userDidInterfereWithAutoplay();
</ins><span class="cx">
</span><del>- m_playbackWithoutUserGesture = PlaybackWithoutUserGesture::None;
</del><ins>+ setPlaybackWithoutUserGesture(PlaybackWithoutUserGesture::None);
</ins><span class="cx">
</span><span class="cx"> if (!m_paused) {
</span><span class="cx"> m_paused = true;
</span><span class="lines">@@ -3386,14 +3384,8 @@
</span><span class="cx"> if (ScriptController::processingUserGestureForMedia()) {
</span><span class="cx"> removeBehaviorsRestrictionsAfterFirstUserGesture(MediaElementSession::AllRestrictions & ~MediaElementSession::RequireUserGestureToControlControlsManager);
</span><span class="cx">
</span><del>- if (hasAudio() && m_muted) {
- if (m_playbackWithoutUserGesture == PlaybackWithoutUserGesture::Started) {
- if (Page* page = document().page())
- page->chrome().client().handleAutoplayEvent(AutoplayEvent::UserDidInterfereWithPlayback);
- }
-
- m_playbackWithoutUserGesture = PlaybackWithoutUserGesture::None;
- }
</del><ins>+ if (hasAudio() && m_muted)
+ userDidInterfereWithAutoplay();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Avoid recursion when the player reports volume changes.
</span><span class="lines">@@ -4454,7 +4446,7 @@
</span><span class="cx"> if (Page* page = document().page())
</span><span class="cx"> page->chrome().client().handleAutoplayEvent(AutoplayEvent::DidEndMediaPlaybackWithoutUserInterference);
</span><span class="cx"> }
</span><del>- m_playbackWithoutUserGesture = PlaybackWithoutUserGesture::None;
</del><ins>+ setPlaybackWithoutUserGesture(PlaybackWithoutUserGesture::None);
</ins><span class="cx"> }
</span><span class="cx"> // If the media element has a current media controller, then report the controller state
</span><span class="cx"> // for the media element's current media controller.
</span><span class="lines">@@ -5223,7 +5215,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- m_playbackWithoutUserGesture = PlaybackWithoutUserGesture::None;
</del><ins>+ setPlaybackWithoutUserGesture(PlaybackWithoutUserGesture::None);
</ins><span class="cx">
</span><span class="cx"> userCancelledLoad();
</span><span class="cx">
</span><span class="lines">@@ -7146,19 +7138,43 @@
</span><span class="cx"> return state;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void HTMLMediaElement::userDidInterfereWithAutoplay()
+{
+ if (m_playbackWithoutUserGesture != PlaybackWithoutUserGesture::Started)
+ return;
+
+ // Only consider interference in the first 10 seconds of automatic playback.
+ if (currentTime() - m_playbackWithoutUserGestureStartedTime->toDouble() > 10)
+ return;
+
+ if (Page* page = document().page())
+ page->chrome().client().handleAutoplayEvent(AutoplayEvent::UserDidInterfereWithPlayback);
+
+ setPlaybackWithoutUserGesture(PlaybackWithoutUserGesture::None);
+}
+
+void HTMLMediaElement::setPlaybackWithoutUserGesture(PlaybackWithoutUserGesture playbackWithoutUserGesture)
+{
+ m_playbackWithoutUserGesture = playbackWithoutUserGesture;
+
+ switch (playbackWithoutUserGesture) {
+ case PlaybackWithoutUserGesture::Started:
+ m_playbackWithoutUserGestureStartedTime = currentMediaTime();
+ break;
+ case PlaybackWithoutUserGesture::None:
+ case PlaybackWithoutUserGesture::Prevented:
+ m_playbackWithoutUserGestureStartedTime = std::nullopt;
+ break;
+ }
+}
+
</ins><span class="cx"> void HTMLMediaElement::pageMutedStateDidChange()
</span><span class="cx"> {
</span><span class="cx"> updateVolume();
</span><span class="cx">
</span><span class="cx"> if (Page* page = document().page()) {
</span><del>- if (hasAudio() && !muted() && page->isAudioMuted()) {
- if (m_playbackWithoutUserGesture == PlaybackWithoutUserGesture::Started) {
- if (Page* page = document().page())
- page->chrome().client().handleAutoplayEvent(AutoplayEvent::UserDidInterfereWithPlayback);
- }
-
- m_playbackWithoutUserGesture = PlaybackWithoutUserGesture::None;
- }
</del><ins>+ if (hasAudio() && !muted() && page->isAudioMuted())
+ userDidInterfereWithAutoplay();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (213686 => 213687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2017-03-10 00:38:20 UTC (rev 213686)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2017-03-10 00:44:42 UTC (rev 213687)
</span><span class="lines">@@ -733,6 +733,10 @@
</span><span class="cx"> void dispatchPlayPauseEventsIfNeedsQuirks();
</span><span class="cx"> SuccessOr<MediaPlaybackDenialReason> canTransitionFromAutoplayToPlay() const;
</span><span class="cx">
</span><ins>+ enum class PlaybackWithoutUserGesture { None, Started, Prevented };
+ void setPlaybackWithoutUserGesture(PlaybackWithoutUserGesture);
+ void userDidInterfereWithAutoplay();
+
</ins><span class="cx"> MediaTime minTimeSeekable() const;
</span><span class="cx"> MediaTime maxTimeSeekable() const;
</span><span class="cx">
</span><span class="lines">@@ -993,8 +997,8 @@
</span><span class="cx"> bool m_haveVisibleTextTrack : 1;
</span><span class="cx"> bool m_processingPreferenceChange : 1;
</span><span class="cx">
</span><del>- enum class PlaybackWithoutUserGesture { None, Started, Prevented };
</del><span class="cx"> PlaybackWithoutUserGesture m_playbackWithoutUserGesture;
</span><ins>+ std::optional<MediaTime> m_playbackWithoutUserGestureStartedTime;
</ins><span class="cx">
</span><span class="cx"> String m_subtitleTrackLanguage;
</span><span class="cx"> MediaTime m_lastTextTrackUpdateTime { -1, 1 };
</span></span></pre>
</div>
</div>
</body>
</html>