<!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>[210461] trunk/Source/WebKit2</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/210461">210461</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-06 17:06:24 -0800 (Fri, 06 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add infrastructure for sending autoplay website policies to WebKit
https://bugs.webkit.org/show_bug.cgi?id=166781
Patch by Matt Rajca <mrajca@apple.com> on 2017-01-06
Reviewed by Alex Christensen.
* Shared/WebsitePolicies.h:
(WebKit::WebsitePolicies::encode):
(WebKit::WebsitePolicies::decode):
* UIProcess/API/APIWebsitePolicies.h:
* UIProcess/API/C/WKWebsitePolicies.cpp:
(WKWebsitePoliciesGetAutoplayPolicy):
(WKWebsitePoliciesSetAutoplayPolicy):
* UIProcess/API/C/WKWebsitePolicies.h:
* UIProcess/API/Cocoa/_WKWebsitePolicies.h:
* UIProcess/API/Cocoa/_WKWebsitePolicies.mm:
(-[_WKWebsitePolicies setAutoplayPolicy:]):
(-[_WKWebsitePolicies autoplayPolicy]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebsitePoliciesh">trunk/Source/WebKit2/Shared/WebsitePolicies.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIWebsitePoliciesh">trunk/Source/WebKit2/UIProcess/API/APIWebsitePolicies.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKWebsitePoliciescpp">trunk/Source/WebKit2/UIProcess/API/C/WKWebsitePolicies.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKWebsitePoliciesh">trunk/Source/WebKit2/UIProcess/API/C/WKWebsitePolicies.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKWebsitePoliciesh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsitePolicies.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKWebsitePoliciesmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsitePolicies.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (210460 => 210461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-07 00:34:38 UTC (rev 210460)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-07 01:06:24 UTC (rev 210461)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-01-06 Matt Rajca <mrajca@apple.com>
+
+ Add infrastructure for sending autoplay website policies to WebKit
+ https://bugs.webkit.org/show_bug.cgi?id=166781
+
+ Reviewed by Alex Christensen.
+
+ * Shared/WebsitePolicies.h:
+ (WebKit::WebsitePolicies::encode):
+ (WebKit::WebsitePolicies::decode):
+ * UIProcess/API/APIWebsitePolicies.h:
+ * UIProcess/API/C/WKWebsitePolicies.cpp:
+ (WKWebsitePoliciesGetAutoplayPolicy):
+ (WKWebsitePoliciesSetAutoplayPolicy):
+ * UIProcess/API/C/WKWebsitePolicies.h:
+ * UIProcess/API/Cocoa/_WKWebsitePolicies.h:
+ * UIProcess/API/Cocoa/_WKWebsitePolicies.mm:
+ (-[_WKWebsitePolicies setAutoplayPolicy:]):
+ (-[_WKWebsitePolicies autoplayPolicy]):
+
</ins><span class="cx"> 2017-01-05 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] Network process crash in WebKit::CustomProtocolManagerImpl::didFailWithError
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebsitePoliciesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebsitePolicies.h (210460 => 210461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebsitePolicies.h 2017-01-07 00:34:38 UTC (rev 210460)
+++ trunk/Source/WebKit2/Shared/WebsitePolicies.h 2017-01-07 01:06:24 UTC (rev 210461)
</span><span class="lines">@@ -27,9 +27,16 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+enum class WebsiteAutoplayPolicy {
+ UseHeuristics,
+ AlwaysAllow,
+ AlwaysDeny
+};
+
</ins><span class="cx"> struct WebsitePolicies {
</span><span class="cx">
</span><span class="cx"> bool contentBlockersEnabled { true };
</span><ins>+ WebsiteAutoplayPolicy autoplayPolicy { WebsiteAutoplayPolicy::UseHeuristics };
</ins><span class="cx">
</span><span class="cx"> template<class Encoder> void encode(Encoder&) const;
</span><span class="cx"> template<class Decoder> static bool decode(Decoder&, WebsitePolicies&);
</span><span class="lines">@@ -38,6 +45,7 @@
</span><span class="cx"> template<class Encoder> void WebsitePolicies::encode(Encoder& encoder) const
</span><span class="cx"> {
</span><span class="cx"> encoder << contentBlockersEnabled;
</span><ins>+ encoder.encodeEnum(autoplayPolicy);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<class Decoder> bool WebsitePolicies::decode(Decoder& decoder, WebsitePolicies& result)
</span><span class="lines">@@ -44,6 +52,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (!decoder.decode(result.contentBlockersEnabled))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decodeEnum(result.autoplayPolicy))
+ return false;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIWebsitePoliciesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIWebsitePolicies.h (210460 => 210461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIWebsitePolicies.h 2017-01-07 00:34:38 UTC (rev 210460)
+++ trunk/Source/WebKit2/UIProcess/API/APIWebsitePolicies.h 2017-01-07 01:06:24 UTC (rev 210461)
</span><span class="lines">@@ -38,7 +38,10 @@
</span><span class="cx">
</span><span class="cx"> bool contentBlockersEnabled() const { return m_websitePolicies.contentBlockersEnabled; }
</span><span class="cx"> void setContentBlockersEnabled(bool enabled) { m_websitePolicies.contentBlockersEnabled = enabled; }
</span><del>-
</del><ins>+
+ WebKit::WebsiteAutoplayPolicy autoplayPolicy() const { return m_websitePolicies.autoplayPolicy; }
+ void setAutoplayPolicy(WebKit::WebsiteAutoplayPolicy policy) { m_websitePolicies.autoplayPolicy = policy; }
+
</ins><span class="cx"> const WebKit::WebsitePolicies& websitePolicies() { return m_websitePolicies; }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKWebsitePoliciescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKWebsitePolicies.cpp (210460 => 210461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKWebsitePolicies.cpp 2017-01-07 00:34:38 UTC (rev 210460)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKWebsitePolicies.cpp 2017-01-07 01:06:24 UTC (rev 210461)
</span><span class="lines">@@ -51,3 +51,30 @@
</span><span class="cx"> {
</span><span class="cx"> return toImpl(websitePolicies)->contentBlockersEnabled();
</span><span class="cx"> }
</span><ins>+
+WKWebsiteAutoplayPolicy WKWebsitePoliciesGetAutoplayPolicy(WKWebsitePoliciesRef websitePolicies)
+{
+ switch (toImpl(websitePolicies)->autoplayPolicy()) {
+ case WebsiteAutoplayPolicy::AlwaysAllow:
+ return kWKWebsiteAutoplayPolicyAlwaysAllow;
+ case WebsiteAutoplayPolicy::AlwaysDeny:
+ return kWKWebsiteAutoplayPolicyAlwaysDeny;
+ case WebsiteAutoplayPolicy::UseHeuristics:
+ return kWKWebsiteAutoplayPolicyUseHeuristics;
+ }
+}
+
+void WKWebsitePoliciesSetAutoplayPolicy(WKWebsitePoliciesRef websitePolicies, WKWebsiteAutoplayPolicy autoplayPolicy)
+{
+ switch (autoplayPolicy) {
+ case kWKWebsiteAutoplayPolicyAlwaysAllow:
+ toImpl(websitePolicies)->setAutoplayPolicy(WebsiteAutoplayPolicy::AlwaysAllow);
+ break;
+ case kWKWebsiteAutoplayPolicyAlwaysDeny:
+ toImpl(websitePolicies)->setAutoplayPolicy(WebsiteAutoplayPolicy::AlwaysDeny);
+ break;
+ case kWKWebsiteAutoplayPolicyUseHeuristics:
+ toImpl(websitePolicies)->setAutoplayPolicy(WebsiteAutoplayPolicy::UseHeuristics);
+ break;
+ }
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKWebsitePoliciesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKWebsitePolicies.h (210460 => 210461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKWebsitePolicies.h 2017-01-07 00:34:38 UTC (rev 210460)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKWebsitePolicies.h 2017-01-07 01:06:24 UTC (rev 210461)
</span><span class="lines">@@ -33,11 +33,20 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKTypeID WKWebsitePoliciesGetTypeID();
</span><span class="cx">
</span><ins>+enum WKWebsiteAutoplayPolicy {
+ kWKWebsiteAutoplayPolicyUseHeuristics,
+ kWKWebsiteAutoplayPolicyAlwaysAllow,
+ kWKWebsiteAutoplayPolicyAlwaysDeny
+};
+
</ins><span class="cx"> WK_EXPORT WKWebsitePoliciesRef WKWebsitePoliciesCreate();
</span><span class="cx">
</span><span class="cx"> WK_EXPORT bool WKWebsitePoliciesGetContentBlockersEnabled(WKWebsitePoliciesRef);
</span><span class="cx"> WK_EXPORT void WKWebsitePoliciesSetContentBlockersEnabled(WKWebsitePoliciesRef, bool);
</span><span class="cx">
</span><ins>+WK_EXPORT WKWebsiteAutoplayPolicy WKWebsitePoliciesGetAutoplayPolicy(WKWebsitePoliciesRef);
+WK_EXPORT void WKWebsitePoliciesSetAutoplayPolicy(WKWebsitePoliciesRef, WKWebsiteAutoplayPolicy);
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsitePoliciesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsitePolicies.h (210460 => 210461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsitePolicies.h 2017-01-07 00:34:38 UTC (rev 210460)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsitePolicies.h 2017-01-07 01:06:24 UTC (rev 210461)
</span><span class="lines">@@ -27,10 +27,17 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+typedef NS_ENUM(NSInteger, _WKWebsiteAutoplayPolicy) {
+ _WKWebsiteAutoplayPolicyUseHeuristics,
+ _WKWebsiteAutoplayPolicyAlwaysAllow,
+ _WKWebsiteAutoplayPolicyAlwaysDeny
+} WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
+
</ins><span class="cx"> WK_CLASS_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA))
</span><span class="cx"> @interface _WKWebsitePolicies : NSObject
</span><span class="cx">
</span><span class="cx"> @property (nonatomic) BOOL contentBlockersEnabled;
</span><ins>+@property (nonatomic) _WKWebsiteAutoplayPolicy autoplayPolicy;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsitePoliciesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsitePolicies.mm (210460 => 210461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsitePolicies.mm 2017-01-07 00:34:38 UTC (rev 210460)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsitePolicies.mm 2017-01-07 01:06:24 UTC (rev 210461)
</span><span class="lines">@@ -57,6 +57,33 @@
</span><span class="cx"> return _websitePolicies->contentBlockersEnabled();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)setAutoplayPolicy:(_WKWebsiteAutoplayPolicy)autoplayPolicy
+{
+ switch (autoplayPolicy) {
+ case _WKWebsiteAutoplayPolicyUseHeuristics:
+ _websitePolicies->setAutoplayPolicy(WebKit::WebsiteAutoplayPolicy::UseHeuristics);
+ break;
+ case _WKWebsiteAutoplayPolicyAlwaysAllow:
+ _websitePolicies->setAutoplayPolicy(WebKit::WebsiteAutoplayPolicy::AlwaysAllow);
+ break;
+ case _WKWebsiteAutoplayPolicyAlwaysDeny:
+ _websitePolicies->setAutoplayPolicy(WebKit::WebsiteAutoplayPolicy::AlwaysDeny);
+ break;
+ }
+}
+
+- (_WKWebsiteAutoplayPolicy)autoplayPolicy
+{
+ switch (_websitePolicies->autoplayPolicy()) {
+ case WebKit::WebsiteAutoplayPolicy::UseHeuristics:
+ return _WKWebsiteAutoplayPolicyUseHeuristics;
+ case WebKit::WebsiteAutoplayPolicy::AlwaysAllow:
+ return _WKWebsiteAutoplayPolicyAlwaysAllow;
+ case WebKit::WebsiteAutoplayPolicy::AlwaysDeny:
+ return _WKWebsiteAutoplayPolicyAlwaysDeny;
+ }
+}
+
</ins><span class="cx"> - (NSString *)description
</span><span class="cx"> {
</span><span class="cx"> return [NSString stringWithFormat:@"<%@: %p; contentBlockersEnabled = %d>", NSStringFromClass(self.class), self, self.contentBlockersEnabled];
</span></span></pre>
</div>
</div>
</body>
</html>