<!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>[186009] 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/186009">186009</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-06-26 14:33:05 -0700 (Fri, 26 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>No audio on animated page with the attached fixed layout epub
https://bugs.webkit.org/show_bug.cgi?id=146365
Source/WebCore:
Reviewed by Eric Carlson.
The new restriction RequireUserGestureForAudioRateChange conflicted
with existing clients who expected RequireUserGestureForRateChange
to allow autoplaying audio. Update the logic to ensure that
RequireUserGestureForRateChange covers all media when set to
false.
This may require a revisit once we're using RequireUserGestureForAudioRateChange
in production, because the global setting will trump that, and
most clients have the global setting to false. We'll need to come
up with a way to allow legacy clients to preserve their behaviour.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::HTMLMediaElement): Only restrict audio
if RequireUserGestureForRateChange is also false.
LayoutTests:
<rdar://problem/21360354>
Reviewed by Eric Carlson.
The test to ensure audio needs a user gesture now needs to also
restrict the general case.
* media/audio-playback-restriction-play.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediaaudioplaybackrestrictionplayhtml">trunk/LayoutTests/media/audio-playback-restriction-play.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (186008 => 186009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-26 21:24:03 UTC (rev 186008)
+++ trunk/LayoutTests/ChangeLog 2015-06-26 21:33:05 UTC (rev 186009)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-06-26 Dean Jackson <dino@apple.com>
+
+ No audio on animated page with the attached fixed layout epub
+ https://bugs.webkit.org/show_bug.cgi?id=146365
+ <rdar://problem/21360354>
+
+ Reviewed by Eric Carlson.
+
+ The test to ensure audio needs a user gesture now needs to also
+ restrict the general case.
+
+ * media/audio-playback-restriction-play.html:
+
</ins><span class="cx"> 2015-06-26 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Sans-serif generic font family should map to PingFang
</span></span></pre></div>
<a id="trunkLayoutTestsmediaaudioplaybackrestrictionplayhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/audio-playback-restriction-play.html (186008 => 186009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/audio-playback-restriction-play.html 2015-06-26 21:24:03 UTC (rev 186008)
+++ trunk/LayoutTests/media/audio-playback-restriction-play.html 2015-06-26 21:33:05 UTC (rev 186009)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> video = document.getElementsByTagName('audio')[0];
</span><span class="cx">
</span><span class="cx"> if (window.internals)
</span><del>- run('internals.setMediaElementRestrictions(video, "RequireUserGestureForAudioRateChange")');
</del><ins>+ run('internals.setMediaElementRestrictions(video, "RequireUserGestureForRateChange,RequireUserGestureForAudioRateChange")');
</ins><span class="cx">
</span><span class="cx"> waitForEventAndFail('error');
</span><span class="cx"> waitForEvent('canplaythrough', canplaythrough);
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> </head>
</span><span class="cx">
</span><span class="cx"> <body onload="runTest()">
</span><del>- <p>Test that, when RequireUserGestureForAudioRateChange is set, starting playback of an audio file requires a user gesture.</p>
</del><ins>+ <p>Test that, when both RequireUserGestureForRateChange and RequireUserGestureForAudioRateChange is set, starting playback of an audio file requires a user gesture.</p>
</ins><span class="cx"> <audio controls autoplay></audio>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186008 => 186009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-26 21:24:03 UTC (rev 186008)
+++ trunk/Source/WebCore/ChangeLog 2015-06-26 21:33:05 UTC (rev 186009)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-06-26 Dean Jackson <dino@apple.com>
+
+ No audio on animated page with the attached fixed layout epub
+ https://bugs.webkit.org/show_bug.cgi?id=146365
+
+ Reviewed by Eric Carlson.
+
+ The new restriction RequireUserGestureForAudioRateChange conflicted
+ with existing clients who expected RequireUserGestureForRateChange
+ to allow autoplaying audio. Update the logic to ensure that
+ RequireUserGestureForRateChange covers all media when set to
+ false.
+
+ This may require a revisit once we're using RequireUserGestureForAudioRateChange
+ in production, because the global setting will trump that, and
+ most clients have the global setting to false. We'll need to come
+ up with a way to allow legacy clients to preserve their behaviour.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::HTMLMediaElement): Only restrict audio
+ if RequireUserGestureForRateChange is also false.
+
</ins><span class="cx"> 2015-06-25 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of ScrollbarThemeClient now that it's unused
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (186008 => 186009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-06-26 21:24:03 UTC (rev 186008)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-06-26 21:33:05 UTC (rev 186009)
</span><span class="lines">@@ -392,7 +392,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span><del>- if (settings && settings->audioPlaybackRequiresUserGesture())
</del><ins>+ if (settings && settings->audioPlaybackRequiresUserGesture() && settings->requiresUserGestureForMediaPlayback())
</ins><span class="cx"> m_mediaSession->addBehaviorRestriction(MediaElementSession::RequireUserGestureForAudioRateChange);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span></span></pre>
</div>
</div>
</body>
</html>