<!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>[213586] 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/213586">213586</a></dd>
<dt>Author</dt> <dd>mrajca@apple.com</dd>
<dt>Date</dt> <dd>2017-03-08 10:48:32 -0800 (Wed, 08 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for updating autoplay policies after a page has been loaded.
https://bugs.webkit.org/show_bug.cgi?id=169360
Reviewed by Alex Christensen.
Source/WebKit2:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updateWebsitePolicies):
Tools:
* TestWebKitAPI/Tests/WebKit2/autoplay-check.html:
* TestWebKitAPI/Tests/WebKit2Cocoa/WebsitePolicies.mm:
(TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2autoplaycheckhtml">trunk/Tools/TestWebKitAPI/Tests/WebKit2/autoplay-check.html</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaWebsitePoliciesmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsitePolicies.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (213585 => 213586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-03-08 18:48:29 UTC (rev 213585)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-08 18:48:32 UTC (rev 213586)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-03-08 Matt Rajca <mrajca@apple.com>
+
+ Add support for updating autoplay policies after a page has been loaded.
+ https://bugs.webkit.org/show_bug.cgi?id=169360
+
+ Reviewed by Alex Christensen.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updateWebsitePolicies):
+
</ins><span class="cx"> 2017-03-08 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Switching focus from a UITextField to an editable WKWebView causes the keyboard to dance
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (213585 => 213586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-03-08 18:48:29 UTC (rev 213585)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-03-08 18:48:32 UTC (rev 213586)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><span class="cx"> #include "APIGeometry.h"
</span><ins>+#include "APIWebsitePolicies.h"
</ins><span class="cx"> #include "AssistedNodeInformation.h"
</span><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "DragControllerAction.h"
</span><span class="lines">@@ -5448,9 +5449,29 @@
</span><span class="cx"> m_loaderClient.featuresUsedInPage(this, namedFeatures);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::updateWebsitePolicies(const WebsitePolicies&)
</del><ins>+void WebPage::updateWebsitePolicies(const WebsitePolicies& websitePolicies)
</ins><span class="cx"> {
</span><del>- // FIXME: Update the website policies in m_page.
</del><ins>+ if (!m_page)
+ return;
+
+ auto* documentLoader = m_page->mainFrame().loader().documentLoader();
+ if (!documentLoader)
+ return;
+
+ switch (websitePolicies.autoplayPolicy) {
+ case WebsiteAutoplayPolicy::Default:
+ documentLoader->setAutoplayPolicy(AutoplayPolicy::Default);
+ break;
+ case WebsiteAutoplayPolicy::Allow:
+ documentLoader->setAutoplayPolicy(AutoplayPolicy::Allow);
+ break;
+ case WebsiteAutoplayPolicy::AllowWithoutSound:
+ documentLoader->setAutoplayPolicy(AutoplayPolicy::AllowWithoutSound);
+ break;
+ case WebsiteAutoplayPolicy::Deny:
+ documentLoader->setAutoplayPolicy(AutoplayPolicy::Deny);
+ break;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned WebPage::extendIncrementalRenderingSuppression()
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (213585 => 213586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-08 18:48:29 UTC (rev 213585)
+++ trunk/Tools/ChangeLog 2017-03-08 18:48:32 UTC (rev 213586)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-03-08 Matt Rajca <mrajca@apple.com>
+
+ Add support for updating autoplay policies after a page has been loaded.
+ https://bugs.webkit.org/show_bug.cgi?id=169360
+
+ Reviewed by Alex Christensen.
+
+ * TestWebKitAPI/Tests/WebKit2/autoplay-check.html:
+ * TestWebKitAPI/Tests/WebKit2Cocoa/WebsitePolicies.mm:
+ (TEST):
+
</ins><span class="cx"> 2017-03-08 Jonathan Bedard <jbedard@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r213545.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2autoplaycheckhtml"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/autoplay-check.html (213585 => 213586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/autoplay-check.html 2017-03-08 18:48:29 UTC (rev 213585)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/autoplay-check.html 2017-03-08 18:48:32 UTC (rev 213586)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <script>
</span><del>- function pageLoaded() {
</del><ins>+ function playVideo() {
</ins><span class="cx"> document.getElementById("video").play().then(function() {
</span><span class="cx"> try {
</span><span class="cx"> window.webkit.messageHandlers.testHandler.postMessage("autoplayed");
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span><del>- <body onload="pageLoaded()">
</del><ins>+ <body onload="playVideo()">
</ins><span class="cx"> <video id="video" playsinline src="test.mp4" />
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaWebsitePoliciesmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsitePolicies.mm (213585 => 213586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsitePolicies.mm 2017-03-08 18:48:29 UTC (rev 213585)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WebsitePolicies.mm 2017-03-08 18:48:32 UTC (rev 213586)
</span><span class="lines">@@ -217,6 +217,13 @@
</span><span class="cx"> [webView loadRequest:requestWithAudio];
</span><span class="cx"> [webView waitForMessage:@"did-not-play"];
</span><span class="cx">
</span><ins>+ // Test updating website policies.
+ _WKWebsitePolicies *websitePolicies = [[[_WKWebsitePolicies alloc] init] autorelease];
+ websitePolicies.autoplayPolicy = _WKWebsiteAutoplayPolicyAllow;
+ [webView _updateWebsitePolicies:websitePolicies];
+ [webView stringByEvaluatingJavaScript:@"playVideo()"];
+ [webView waitForMessage:@"autoplayed"];
+
</ins><span class="cx"> [webView loadRequest:requestWithoutAudio];
</span><span class="cx"> [webView waitForMessage:@"did-not-play"];
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>