<!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>[212332] 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/212332">212332</a></dd>
<dt>Author</dt> <dd>mrajca@apple.com</dd>
<dt>Date</dt> <dd>2017-02-14 15:37:26 -0800 (Tue, 14 Feb 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Website policies: iframes should respect the autoplay policy of the top-level document
https://bugs.webkit.org/show_bug.cgi?id=168333

Reviewed by Alex Christensen.

Source/WebCore:

API tests were added.

* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::HTMLMediaElement):

Tools:

* TestWebKitAPI/Tests/WebKit2/autoplay-check-frame.html: Added.
* TestWebKitAPI/Tests/WebKit2/autoplay-check-in-iframe.html: Added.
* TestWebKitAPI/Tests/WebKit2Cocoa/WebsitePolicies.mm:
(-[AutoplayPoliciesDelegate _webView:decidePolicyForNavigationAction:decisionHandler:]):
(TEST):</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="#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="#trunkToolsTestWebKitAPITestsWebKit2autoplaycheckframehtml">trunk/Tools/TestWebKitAPI/Tests/WebKit2/autoplay-check-frame.html</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2autoplaycheckiniframehtml">trunk/Tools/TestWebKitAPI/Tests/WebKit2/autoplay-check-in-iframe.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212331 => 212332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2017-02-14 23:31:12 UTC (rev 212331)
+++ trunk/Source/WebCore/ChangeLog        2017-02-14 23:37:26 UTC (rev 212332)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-02-14  Matt Rajca  &lt;mrajca@apple.com&gt;
+
+        Website policies: iframes should respect the autoplay policy of the top-level document
+        https://bugs.webkit.org/show_bug.cgi?id=168333
+
+        Reviewed by Alex Christensen.
+
+        API tests were added.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::HTMLMediaElement):
+
</ins><span class="cx"> 2017-02-14  Dean Jackson  &lt;dino@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Rename preferLowPowerWebGLRendering setting to forceWebGLUsesLowPower
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (212331 => 212332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp        2017-02-14 23:31:12 UTC (rev 212331)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp        2017-02-14 23:37:26 UTC (rev 212332)
</span><span class="lines">@@ -460,8 +460,9 @@
</span><span class="cx">         m_mediaSession-&gt;addBehaviorRestriction(MediaElementSession::InvisibleAutoplayNotPermitted);
</span><span class="cx"> 
</span><span class="cx">     if (document.ownerElement() || !document.isMediaDocument()) {
</span><del>-        bool shouldAudioPlaybackRequireUserGesture = document.audioPlaybackRequiresUserGesture();
-        bool shouldVideoPlaybackRequireUserGesture = document.videoPlaybackRequiresUserGesture();
</del><ins>+        const auto&amp; topDocument = document.topDocument();
+        bool shouldAudioPlaybackRequireUserGesture = topDocument.audioPlaybackRequiresUserGesture();
+        bool shouldVideoPlaybackRequireUserGesture = topDocument.videoPlaybackRequiresUserGesture();
</ins><span class="cx"> 
</span><span class="cx">         if (shouldVideoPlaybackRequireUserGesture) {
</span><span class="cx">             m_mediaSession-&gt;addBehaviorRestriction(MediaElementSession::RequireUserGestureForVideoRateChange);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (212331 => 212332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2017-02-14 23:31:12 UTC (rev 212331)
+++ trunk/Tools/ChangeLog        2017-02-14 23:37:26 UTC (rev 212332)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-02-14  Matt Rajca  &lt;mrajca@apple.com&gt;
+
+        Website policies: iframes should respect the autoplay policy of the top-level document
+        https://bugs.webkit.org/show_bug.cgi?id=168333
+
+        Reviewed by Alex Christensen.
+
+        * TestWebKitAPI/Tests/WebKit2/autoplay-check-frame.html: Added.
+        * TestWebKitAPI/Tests/WebKit2/autoplay-check-in-iframe.html: Added.
+        * TestWebKitAPI/Tests/WebKit2Cocoa/WebsitePolicies.mm:
+        (-[AutoplayPoliciesDelegate _webView:decidePolicyForNavigationAction:decisionHandler:]):
+        (TEST):
+
</ins><span class="cx"> 2017-02-14  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         HTML Form Validation bubble should take minimum font size setting into consideration
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (212331 => 212332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj        2017-02-14 23:31:12 UTC (rev 212331)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj        2017-02-14 23:37:26 UTC (rev 212332)
</span><span class="lines">@@ -521,6 +521,8 @@
</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>+                C9C60E651E53A9DC006DA181 /* autoplay-check-frame.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = C9C60E631E53A9BA006DA181 /* autoplay-check-frame.html */; };
+                C9C60E661E53A9DC006DA181 /* autoplay-check-in-iframe.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = C9C60E641E53A9BA006DA181 /* autoplay-check-in-iframe.html */; };
</ins><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="cx">                 CD59F53419E9110D00CF1835 /* file-with-mse.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CD59F53219E910AA00CF1835 /* file-with-mse.html */; };
</span><span class="cx">                 CD59F53519E9110D00CF1835 /* test-mse.mp4 in Copy Resources */ = {isa = PBXBuildFile; fileRef = CD59F53319E910BC00CF1835 /* test-mse.mp4 */; };
</span><span class="lines">@@ -638,6 +640,8 @@
</span><span class="cx">                                 F45B960C1E50708800CFAC5D /* autofocus-contenteditable.html in Copy Resources */,
</span><span class="cx">                                 F4F93F341E4E918D00E33E2E /* image-and-textarea.html in Copy Resources */,
</span><span class="cx">                                 F4D4F3BC1E4E511F00BB2767 /* image-and-contenteditable.html in Copy Resources */,
</span><ins>+                                C9C60E651E53A9DC006DA181 /* autoplay-check-frame.html in Copy Resources */,
+                                C9C60E661E53A9DC006DA181 /* autoplay-check-in-iframe.html in Copy Resources */,
</ins><span class="cx">                                 F47728991E4AE3C1007ABF6A /* full-page-contenteditable.html in Copy Resources */,
</span><span class="cx">                                 C99B675F1E39736F00FC6C80 /* no-autoplay-with-controls.html in Copy Resources */,
</span><span class="cx">                                 C99B675D1E39722000FC6C80 /* js-play-with-controls.html in Copy Resources */,
</span><span class="lines">@@ -1327,6 +1331,8 @@
</span><span class="cx">                 C99B675A1E3971FC00FC6C80 /* autoplay-with-controls.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = &quot;autoplay-with-controls.html&quot;; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 C99B675B1E3971FC00FC6C80 /* js-play-with-controls.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = &quot;js-play-with-controls.html&quot;; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 C99B675E1E39735C00FC6C80 /* no-autoplay-with-controls.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = &quot;no-autoplay-with-controls.html&quot;; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><ins>+                C9C60E631E53A9BA006DA181 /* autoplay-check-frame.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = &quot;autoplay-check-frame.html&quot;; sourceTree = &quot;&lt;group&gt;&quot;; };
+                C9C60E641E53A9BA006DA181 /* autoplay-check-in-iframe.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = &quot;autoplay-check-in-iframe.html&quot;; sourceTree = &quot;&lt;group&gt;&quot;; };
</ins><span class="cx">                 CD225C071C45A69200140761 /* ParsedContentRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParsedContentRange.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 CD321B031E3A84B700EB21C8 /* video-with-muted-audio-and-webaudio.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = &quot;video-with-muted-audio-and-webaudio.html&quot;; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 CD5393C71757BA9700C07123 /* MD5.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MD5.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -2050,6 +2056,8 @@
</span><span class="cx">                                 93D3D19B17B1A7B000C7C415 /* all-content-in-one-iframe.html */,
</span><span class="cx">                                 F6B7BE9617469B7E008A3445 /* associate-form-controls.html */,
</span><span class="cx">                                 76E182DE15475A8300F1FADD /* auto-submitting-form.html */,
</span><ins>+                                C9C60E631E53A9BA006DA181 /* autoplay-check-frame.html */,
+                                C9C60E641E53A9BA006DA181 /* autoplay-check-in-iframe.html */,
</ins><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></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2autoplaycheckframehtml"></a>
<div class="addfile"><h4>Added: trunk/Tools/TestWebKitAPI/Tests/WebKit2/autoplay-check-frame.html (0 => 212332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/autoplay-check-frame.html                                (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/autoplay-check-frame.html        2017-02-14 23:37:26 UTC (rev 212332)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+&lt;html&gt;
+    &lt;head&gt;
+        &lt;script&gt;
+            function pageLoaded() {
+                document.getElementById(&quot;video&quot;).play().then(function() {
+                    window.parent.postMessage('autoplayed', '*');
+                }).catch(function() {
+                    window.parent.postMessage('did-not-play', '*');
+                });
+            }
+        &lt;/script&gt;
+    &lt;/head&gt;
+    &lt;body onload=&quot;pageLoaded()&quot;&gt;
+        &lt;video id=&quot;video&quot; playsinline src=&quot;test.mp4&quot; /&gt;
+    &lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2autoplaycheckiniframehtml"></a>
<div class="addfile"><h4>Added: trunk/Tools/TestWebKitAPI/Tests/WebKit2/autoplay-check-in-iframe.html (0 => 212332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/autoplay-check-in-iframe.html                                (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/autoplay-check-in-iframe.html        2017-02-14 23:37:26 UTC (rev 212332)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+&lt;html&gt;
+    &lt;head&gt;
+        &lt;script&gt;
+            function pageLoaded() {
+                window.onmessage = function(event) {
+                    try {
+                        window.webkit.messageHandlers.testHandler.postMessage(event.data);
+                    } catch(e) { }
+                };
+            }
+        &lt;/script&gt;
+    &lt;/head&gt;
+    &lt;body onload=&quot;pageLoaded()&quot;&gt;
+        &lt;iframe src=&quot;autoplay-check-frame.html&quot;&gt;&lt;/iframe&gt;
+    &lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaWebsitePoliciesmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsitePolicies.mm (212331 => 212332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsitePolicies.mm        2017-02-14 23:31:12 UTC (rev 212331)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsitePolicies.mm        2017-02-14 23:37:26 UTC (rev 212332)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> @interface AutoplayPoliciesDelegate : NSObject &lt;WKNavigationDelegate, WKUIDelegate&gt;
</span><del>-@property (nonatomic) _WKWebsiteAutoplayPolicy autoplayPolicy;
</del><ins>+@property (nonatomic, copy) _WKWebsiteAutoplayPolicy(^autoplayPolicyForURL)(NSURL *);
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> @implementation AutoplayPoliciesDelegate
</span><span class="lines">@@ -173,7 +173,8 @@
</span><span class="cx"> - (void)_webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy, _WKWebsitePolicies *))decisionHandler
</span><span class="cx"> {
</span><span class="cx">     _WKWebsitePolicies *websitePolicies = [[[_WKWebsitePolicies alloc] init] autorelease];
</span><del>-    websitePolicies.autoplayPolicy = _autoplayPolicy;
</del><ins>+    if (_autoplayPolicyForURL)
+        websitePolicies.autoplayPolicy = _autoplayPolicyForURL(navigationAction.request.URL);
</ins><span class="cx">     decisionHandler(WKNavigationActionPolicyAllow, websitePolicies);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -195,7 +196,9 @@
</span><span class="cx">     NSURLRequest *requestWithAudio = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@&quot;autoplay-check&quot; withExtension:@&quot;html&quot; subdirectory:@&quot;TestWebKitAPI.resources&quot;]];
</span><span class="cx">     NSURLRequest *requestWithoutAudio = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@&quot;autoplay-no-audio-check&quot; withExtension:@&quot;html&quot; subdirectory:@&quot;TestWebKitAPI.resources&quot;]];
</span><span class="cx">     
</span><del>-    [delegate setAutoplayPolicy:_WKWebsiteAutoplayPolicyAllowWithoutSound];
</del><ins>+    [delegate setAutoplayPolicyForURL:^(NSURL *) {
+        return _WKWebsiteAutoplayPolicyAllowWithoutSound;
+    }];
</ins><span class="cx">     [webView loadRequest:requestWithAudio];
</span><span class="cx">     [webView waitForMessage:@&quot;did-not-play&quot;];
</span><span class="cx"> 
</span><span class="lines">@@ -202,7 +205,9 @@
</span><span class="cx">     [webView loadRequest:requestWithoutAudio];
</span><span class="cx">     [webView waitForMessage:@&quot;autoplayed&quot;];
</span><span class="cx"> 
</span><del>-    [delegate setAutoplayPolicy:_WKWebsiteAutoplayPolicyDeny];
</del><ins>+    [delegate setAutoplayPolicyForURL:^(NSURL *) {
+        return _WKWebsiteAutoplayPolicyDeny;
+    }];
</ins><span class="cx">     [webView loadRequest:requestWithAudio];
</span><span class="cx">     [webView waitForMessage:@&quot;did-not-play&quot;];
</span><span class="cx"> 
</span><span class="lines">@@ -209,12 +214,36 @@
</span><span class="cx">     [webView loadRequest:requestWithoutAudio];
</span><span class="cx">     [webView waitForMessage:@&quot;did-not-play&quot;];
</span><span class="cx"> 
</span><del>-    [delegate setAutoplayPolicy:_WKWebsiteAutoplayPolicyAllow];
</del><ins>+    [delegate setAutoplayPolicyForURL:^(NSURL *) {
+        return _WKWebsiteAutoplayPolicyAllow;
+    }];
</ins><span class="cx">     [webView loadRequest:requestWithAudio];
</span><span class="cx">     [webView waitForMessage:@&quot;autoplayed&quot;];
</span><span class="cx"> 
</span><span class="cx">     [webView loadRequest:requestWithoutAudio];
</span><span class="cx">     [webView waitForMessage:@&quot;autoplayed&quot;];
</span><ins>+
+    NSURLRequest *requestWithAudioInIFrame = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@&quot;autoplay-check-in-iframe&quot; withExtension:@&quot;html&quot; subdirectory:@&quot;TestWebKitAPI.resources&quot;]];
+
+    // If the top-level document allows autoplay, any iframes should also autoplay.
+    [delegate setAutoplayPolicyForURL:^(NSURL *url) {
+        if ([url.lastPathComponent isEqualToString:@&quot;autoplay-check-in-iframe.html&quot;])
+            return _WKWebsiteAutoplayPolicyAllow;
+        return _WKWebsiteAutoplayPolicyDeny;
+    }];
+
+    [webView loadRequest:requestWithAudioInIFrame];
+    [webView waitForMessage:@&quot;autoplayed&quot;];
+
+    // If the top-level document disallows autoplay, any iframes should also not autoplay.
+    [delegate setAutoplayPolicyForURL:^(NSURL *url) {
+        if ([url.lastPathComponent isEqualToString:@&quot;autoplay-check-in-iframe.html&quot;])
+            return _WKWebsiteAutoplayPolicyDeny;
+        return _WKWebsiteAutoplayPolicyAllow;
+    }];
+
+    [webView loadRequest:requestWithAudioInIFrame];
+    [webView waitForMessage:@&quot;did-not-play&quot;];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="lines">@@ -230,7 +259,9 @@
</span><span class="cx">     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 336, 276) configuration:configuration.get()]);
</span><span class="cx"> 
</span><span class="cx">     auto delegate = adoptNS([[AutoplayPoliciesDelegate alloc] init]);
</span><del>-    [delegate setAutoplayPolicy:_WKWebsiteAutoplayPolicyDeny];
</del><ins>+    [delegate setAutoplayPolicyForURL:^(NSURL *) {
+        return _WKWebsiteAutoplayPolicyDeny;
+    }];
</ins><span class="cx">     [webView setNavigationDelegate:delegate.get()];
</span><span class="cx"> 
</span><span class="cx">     WKPageUIClientV9 uiClient;
</span></span></pre>
</div>
</div>

</body>
</html>