<!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>[214239] 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/214239">214239</a></dd>
<dt>Author</dt> <dd>mrajca@apple.com</dd>
<dt>Date</dt> <dd>2017-03-21 18:44:21 -0700 (Tue, 21 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Loosen audio playback restrictions when the volume is 0.
https://bugs.webkit.org/show_bug.cgi?id=169897
Reviewed by Eric Carlson.
Source/WebCore:
Added API tests.
* html/MediaElementSession.cpp:
(WebCore::MediaElementSession::playbackPermitted):
Tools:
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* TestWebKitAPI/Tests/WebKit2/autoplay-zero-volume-check.html: Added.
* TestWebKitAPI/Tests/WebKit2Cocoa/WebsitePolicies.mm:
(TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaElementSessioncpp">trunk/Source/WebCore/html/MediaElementSession.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj">trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaWebsitePoliciesmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsitePolicies.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2autoplayzerovolumecheckhtml">trunk/Tools/TestWebKitAPI/Tests/WebKit2/autoplay-zero-volume-check.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214238 => 214239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-22 00:45:15 UTC (rev 214238)
+++ trunk/Source/WebCore/ChangeLog 2017-03-22 01:44:21 UTC (rev 214239)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-03-20 Matt Rajca <mrajca@apple.com>
+
+ Loosen audio playback restrictions when the volume is 0.
+ https://bugs.webkit.org/show_bug.cgi?id=169897
+
+ Reviewed by Eric Carlson.
+
+ Added API tests.
+
+ * html/MediaElementSession.cpp:
+ (WebCore::MediaElementSession::playbackPermitted):
+
</ins><span class="cx"> 2017-03-21 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Disable all virtual tables.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaElementSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (214238 => 214239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaElementSession.cpp 2017-03-22 00:45:15 UTC (rev 214238)
+++ trunk/Source/WebCore/html/MediaElementSession.cpp 2017-03-22 01:44:21 UTC (rev 214239)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> return MediaPlaybackDenialReason::UserGestureRequired;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_restrictions & RequireUserGestureForAudioRateChange && (!element.isVideo() || element.hasAudio()) && !element.muted() && !ScriptController::processingUserGestureForMedia()) {
</del><ins>+ if (m_restrictions & RequireUserGestureForAudioRateChange && (!element.isVideo() || element.hasAudio()) && !element.muted() && element.volume() && !ScriptController::processingUserGestureForMedia()) {
</ins><span class="cx"> LOG(Media, "MediaElementSession::playbackPermitted - returning FALSE because of audio rate change restriction");
</span><span class="cx"> return MediaPlaybackDenialReason::UserGestureRequired;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (214238 => 214239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-22 00:45:15 UTC (rev 214238)
+++ trunk/Tools/ChangeLog 2017-03-22 01:44:21 UTC (rev 214239)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-03-20 Matt Rajca <mrajca@apple.com>
+
+ Loosen audio playback restrictions when the volume is 0.
+ https://bugs.webkit.org/show_bug.cgi?id=169897
+
+ Reviewed by Eric Carlson.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WebKit2/autoplay-zero-volume-check.html: Added.
+ * TestWebKitAPI/Tests/WebKit2Cocoa/WebsitePolicies.mm:
+ (TEST):
+
</ins><span class="cx"> 2017-03-21 Aakash Jain <aakash_jain@apple.com>
</span><span class="cx">
</span><span class="cx"> EWS fails to parse_bug_id_from_attachment_page after bugzilla upgrade
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (214238 => 214239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2017-03-22 00:45:15 UTC (rev 214238)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2017-03-22 01:44:21 UTC (rev 214239)
</span><span class="lines">@@ -537,6 +537,7 @@
</span><span class="cx"> C99B675C1E39721A00FC6C80 /* autoplay-with-controls.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = C99B675A1E3971FC00FC6C80 /* autoplay-with-controls.html */; };
</span><span class="cx"> C99B675D1E39722000FC6C80 /* js-play-with-controls.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = C99B675B1E3971FC00FC6C80 /* js-play-with-controls.html */; };
</span><span class="cx"> C99B675F1E39736F00FC6C80 /* no-autoplay-with-controls.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = C99B675E1E39735C00FC6C80 /* no-autoplay-with-controls.html */; };
</span><ins>+ C99BDF891E80980400C7170E /* autoplay-zero-volume-check.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = C99BDF881E8097E300C7170E /* autoplay-zero-volume-check.html */; };
</ins><span class="cx"> C9C60E651E53A9DC006DA181 /* autoplay-check-frame.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = C9C60E631E53A9BA006DA181 /* autoplay-check-frame.html */; };
</span><span class="cx"> C9C60E661E53A9DC006DA181 /* autoplay-check-in-iframe.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = C9C60E641E53A9BA006DA181 /* autoplay-check-in-iframe.html */; };
</span><span class="cx"> CD321B041E3A85FA00EB21C8 /* video-with-muted-audio-and-webaudio.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CD321B031E3A84B700EB21C8 /* video-with-muted-audio-and-webaudio.html */; };
</span><span class="lines">@@ -653,6 +654,7 @@
</span><span class="cx"> dstPath = TestWebKitAPI.resources;
</span><span class="cx"> dstSubfolderSpec = 7;
</span><span class="cx"> files = (
</span><ins>+ C99BDF891E80980400C7170E /* autoplay-zero-volume-check.html in Copy Resources */,
</ins><span class="cx"> A14AAB651E78DC5400C1ADC2 /* encrypted.pdf in Copy Resources */,
</span><span class="cx"> A1409AD91E7254D4004949D9 /* password-protected.pages in Copy Resources */,
</span><span class="cx"> 5120C83E1E67678F0025B250 /* WebsiteDataStoreCustomPaths.html in Copy Resources */,
</span><span class="lines">@@ -1368,6 +1370,7 @@
</span><span class="cx"> C99B675A1E3971FC00FC6C80 /* autoplay-with-controls.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "autoplay-with-controls.html"; sourceTree = "<group>"; };
</span><span class="cx"> C99B675B1E3971FC00FC6C80 /* js-play-with-controls.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "js-play-with-controls.html"; sourceTree = "<group>"; };
</span><span class="cx"> C99B675E1E39735C00FC6C80 /* no-autoplay-with-controls.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "no-autoplay-with-controls.html"; sourceTree = "<group>"; };
</span><ins>+ C99BDF881E8097E300C7170E /* autoplay-zero-volume-check.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "autoplay-zero-volume-check.html"; sourceTree = "<group>"; };
</ins><span class="cx"> C9C60E631E53A9BA006DA181 /* autoplay-check-frame.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "autoplay-check-frame.html"; sourceTree = "<group>"; };
</span><span class="cx"> C9C60E641E53A9BA006DA181 /* autoplay-check-in-iframe.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "autoplay-check-in-iframe.html"; sourceTree = "<group>"; };
</span><span class="cx"> CD225C071C45A69200140761 /* ParsedContentRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParsedContentRange.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -2122,6 +2125,7 @@
</span><span class="cx"> C95984F21E36BC55002C0D45 /* autoplay-check.html */,
</span><span class="cx"> C95984F31E36BC55002C0D45 /* autoplay-no-audio-check.html */,
</span><span class="cx"> C99B675A1E3971FC00FC6C80 /* autoplay-with-controls.html */,
</span><ins>+ C99BDF881E8097E300C7170E /* autoplay-zero-volume-check.html */,
</ins><span class="cx"> 7C486BA01AA1254B003F6F9B /* bundle-file.html */,
</span><span class="cx"> 9BD4239B1E04BFD000200395 /* chinese-character-with-image.html */,
</span><span class="cx"> 1A50AA1F1A2A4EA500F4C345 /* close-from-within-create-page.html */,
</span><span class="lines">@@ -2144,8 +2148,8 @@
</span><span class="cx"> BCBD372E125ABBE600D2C29F /* icon.png */,
</span><span class="cx"> CE3524F51B142BBB0028A7C5 /* input-focus-blur.html */,
</span><span class="cx"> C99B675B1E3971FC00FC6C80 /* js-play-with-controls.html */,
</span><ins>+ 8361F1771E610B2100759B25 /* link-with-download-attribute-with-slashes.html */,
</ins><span class="cx"> 8349D3C31DB9724F004A9F65 /* link-with-download-attribute.html */,
</span><del>- 8361F1771E610B2100759B25 /* link-with-download-attribute-with-slashes.html */,
</del><span class="cx"> 378E647816326FDF00B6C676 /* link-with-title.html */,
</span><span class="cx"> 9361002814DC957B0061379D /* lots-of-iframes.html */,
</span><span class="cx"> 93AF4ECF1506F123007FD57E /* lots-of-images.html */,
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2autoplayzerovolumecheckhtml"></a>
<div class="addfile"><h4>Added: trunk/Tools/TestWebKitAPI/Tests/WebKit2/autoplay-zero-volume-check.html (0 => 214239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/autoplay-zero-volume-check.html (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/autoplay-zero-volume-check.html 2017-03-22 01:44:21 UTC (rev 214239)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<html>
+ <head>
+ <script>
+ function pageLoaded() {
+ var video = document.getElementById("video");
+ video.volume = 0;
+ video.play().then(function() {
+ try {
+ window.webkit.messageHandlers.testHandler.postMessage("autoplayed");
+ } catch(e) { }
+ }).catch(function() {
+ try {
+ window.webkit.messageHandlers.testHandler.postMessage("did-not-play");
+ } catch(e) { }
+ });
+ }
+ </script>
+ </head>
+ <body onload="pageLoaded()">
+ <video id="video" playsinline src="test.mp4" />
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaWebsitePoliciesmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsitePolicies.mm (214238 => 214239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsitePolicies.mm 2017-03-22 00:45:15 UTC (rev 214238)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsitePolicies.mm 2017-03-22 01:44:21 UTC (rev 214239)
</span><span class="lines">@@ -214,6 +214,7 @@
</span><span class="cx">
</span><span class="cx"> NSURLRequest *requestWithAudio = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"autoplay-check" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
</span><span class="cx"> NSURLRequest *requestWithoutAudio = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"autoplay-no-audio-check" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
</span><ins>+ NSURLRequest *requestWithoutVolume = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"autoplay-zero-volume-check" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
</ins><span class="cx">
</span><span class="cx"> [delegate setAutoplayPolicyForURL:^(NSURL *) {
</span><span class="cx"> return _WKWebsiteAutoplayPolicyAllowWithoutSound;
</span><span class="lines">@@ -224,9 +225,15 @@
</span><span class="cx"> [webView loadRequest:requestWithoutAudio];
</span><span class="cx"> [webView waitForMessage:@"autoplayed"];
</span><span class="cx">
</span><ins>+ [webView loadRequest:requestWithoutVolume];
+ [webView waitForMessage:@"autoplayed"];
+
</ins><span class="cx"> [delegate setAutoplayPolicyForURL:^(NSURL *) {
</span><span class="cx"> return _WKWebsiteAutoplayPolicyDeny;
</span><span class="cx"> }];
</span><ins>+ [webView loadRequest:requestWithoutVolume];
+ [webView waitForMessage:@"did-not-play"];
+
</ins><span class="cx"> [webView loadRequest:requestWithAudio];
</span><span class="cx"> [webView waitForMessage:@"did-not-play"];
</span><span class="cx">
</span><span class="lines">@@ -249,6 +256,9 @@
</span><span class="cx"> [webView loadRequest:requestWithoutAudio];
</span><span class="cx"> [webView waitForMessage:@"autoplayed"];
</span><span class="cx">
</span><ins>+ [webView loadRequest:requestWithoutVolume];
+ [webView waitForMessage:@"autoplayed"];
+
</ins><span class="cx"> NSURLRequest *requestWithAudioInIFrame = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"autoplay-check-in-iframe" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
</span><span class="cx">
</span><span class="cx"> // If the top-level document allows autoplay, any iframes should also autoplay.
</span></span></pre>
</div>
</div>
</body>
</html>