<!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>[200516] trunk</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/200516">200516</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-05-06 12:54:15 -0700 (Fri, 06 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Muted media elements should be allowed to autoplay, even if RequireUserGestureForAudioRateChange is set.
https://bugs.webkit.org/show_bug.cgi?id=157404
<rdar://problem/26016802>
Reviewed by Eric Carlson.
Source/WebCore:
Test: media/audio-playback-restriction-play-muted.html
Add element.muted() as a critera of whether playback is permitted when
RequireUserGestureForAudioRateChange is set. Also, make sure to re-evaluate whether the
element should be playing when muted is changed without a user gesture.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::setMuted):
* html/MediaElementSession.cpp:
(WebCore::MediaElementSession::playbackPermitted):
LayoutTests:
* media/audio-playback-restriction-play-muted-expected.txt: Added.
* media/audio-playback-restriction-play-muted.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<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="#trunkSourceWebCorehtmlMediaElementSessioncpp">trunk/Source/WebCore/html/MediaElementSession.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediaaudioplaybackrestrictionplaymutedexpectedtxt">trunk/LayoutTests/media/audio-playback-restriction-play-muted-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediaaudioplaybackrestrictionplaymutedhtml">trunk/LayoutTests/media/audio-playback-restriction-play-muted.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200515 => 200516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-06 19:25:41 UTC (rev 200515)
+++ trunk/LayoutTests/ChangeLog 2016-05-06 19:54:15 UTC (rev 200516)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-05-06 Jer Noble <jer.noble@apple.com>
+
+ Muted media elements should be allowed to autoplay, even if RequireUserGestureForAudioRateChange is set.
+ https://bugs.webkit.org/show_bug.cgi?id=157404
+ <rdar://problem/26016802>
+
+ Reviewed by Eric Carlson.
+
+ * media/audio-playback-restriction-play-muted-expected.txt: Added.
+ * media/audio-playback-restriction-play-muted.html: Added.
+
</ins><span class="cx"> 2016-05-06 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Unprefix CSS Grid Layout properties
</span></span></pre></div>
<a id="trunkLayoutTestsmediaaudioplaybackrestrictionplaymutedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/audio-playback-restriction-play-muted-expected.txt (0 => 200516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/audio-playback-restriction-play-muted-expected.txt (rev 0)
+++ trunk/LayoutTests/media/audio-playback-restriction-play-muted-expected.txt 2016-05-06 19:54:15 UTC (rev 200516)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Test that, when RequireUserGestureForAudioRateChange is set, starting playback of an muted audio file does not require a user gesture.
+
+
+RUN(internals.setMediaElementRestrictions(video, "RequireUserGestureForAudioRateChange"))
+RUN(video.src = findMediaFile("audio", "content/test"))
+EVENT(canplaythrough)
+RUN(video.play())
+EVENT(playing)
+RUN(video.muted = false)
+EVENT(pause)
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediaaudioplaybackrestrictionplaymutedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/audio-playback-restriction-play-muted.html (0 => 200516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/audio-playback-restriction-play-muted.html (rev 0)
+++ trunk/LayoutTests/media/audio-playback-restriction-play-muted.html 2016-05-06 19:54:15 UTC (rev 200516)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <title>audio-playback-restriction</title>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
+
+ <script>
+ function runTest()
+ {
+ video = document.getElementsByTagName('audio')[0];
+
+ if (window.internals)
+ run('internals.setMediaElementRestrictions(video, "RequireUserGestureForAudioRateChange")');
+
+ waitForEventAndFail('error');
+ waitForEvent('canplaythrough', canplaythrough);
+ run('video.src = findMediaFile("audio", "content/test")');
+ }
+
+ function canplaythrough()
+ {
+ waitForEvent('playing', playing);
+ run('video.play()');
+ }
+
+ function playing()
+ {
+ run('video.muted = false');
+ waitForEventAndEnd('pause');
+ failTestIn(100);
+ }
+ </script>
+</head>
+
+<body onload="runTest()">
+ <p>Test that, when RequireUserGestureForAudioRateChange is set, starting playback of an muted audio file does not require a user gesture.</p>
+ <audio muted controls></audio>
+</body>
+</html>
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200515 => 200516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-06 19:25:41 UTC (rev 200515)
+++ trunk/Source/WebCore/ChangeLog 2016-05-06 19:54:15 UTC (rev 200516)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-05-06 Jer Noble <jer.noble@apple.com>
+
+ Muted media elements should be allowed to autoplay, even if RequireUserGestureForAudioRateChange is set.
+ https://bugs.webkit.org/show_bug.cgi?id=157404
+ <rdar://problem/26016802>
+
+ Reviewed by Eric Carlson.
+
+ Test: media/audio-playback-restriction-play-muted.html
+
+ Add element.muted() as a critera of whether playback is permitted when
+ RequireUserGestureForAudioRateChange is set. Also, make sure to re-evaluate whether the
+ element should be playing when muted is changed without a user gesture.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::setMuted):
+ * html/MediaElementSession.cpp:
+ (WebCore::MediaElementSession::playbackPermitted):
+
</ins><span class="cx"> 2016-05-06 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Don't use invalidated ResourceLoadStatistics iterators
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (200515 => 200516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-05-06 19:25:41 UTC (rev 200515)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-05-06 19:54:15 UTC (rev 200516)
</span><span class="lines">@@ -3288,6 +3288,8 @@
</span><span class="cx"> }
</span><span class="cx"> scheduleEvent(eventNames().volumechangeEvent);
</span><span class="cx">
</span><ins>+ updateShouldPlay();
+
</ins><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx"> document().updateIsPlayingMedia(m_elementID);
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaElementSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (200515 => 200516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaElementSession.cpp 2016-05-06 19:25:41 UTC (rev 200515)
+++ trunk/Source/WebCore/html/MediaElementSession.cpp 2016-05-06 19:54:15 UTC (rev 200516)
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_restrictions & RequireUserGestureForAudioRateChange && (!element.isVideo() || element.hasAudio()) && !ScriptController::processingUserGestureForMedia()) {
</del><ins>+ if (m_restrictions & RequireUserGestureForAudioRateChange && (!element.isVideo() || element.hasAudio()) && !element.muted() && !ScriptController::processingUserGestureForMedia()) {
</ins><span class="cx"> LOG(Media, "MediaElementSession::playbackPermitted - returning FALSE because of audio rate change restriction");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>