<!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>[210737] 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/210737">210737</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-13 11:16:34 -0800 (Fri, 13 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Defer use of autoplay heuristics to clients
https://bugs.webkit.org/show_bug.cgi?id=167010
Patch by Matt Rajca <mrajca@apple.com> on 2017-01-13
Reviewed by Alex Christensen.
Switch the autoplay policy tristate to an on/off option since clients should run any
heuristics and simply send their final decision to WebKit.
* Shared/WebsitePolicies.h:
(WebKit::WebsitePolicies::encode):
(WebKit::WebsitePolicies::decode):
* UIProcess/API/APIWebsitePolicies.h:
* UIProcess/API/C/WKWebsitePolicies.cpp:
(WKWebsitePoliciesGetAutoplayEnabled):
(WKWebsitePoliciesSetAutoplayEnabled):
(WKWebsitePoliciesGetAutoplayPolicy): Replaced.
(WKWebsitePoliciesSetAutoplayPolicy): Replaced.
* UIProcess/API/C/WKWebsitePolicies.h:
* UIProcess/API/Cocoa/_WKWebsitePolicies.h:
* UIProcess/API/Cocoa/_WKWebsitePolicies.mm:
(-[_WKWebsitePolicies setAutoplayEnabled:]):
(-[_WKWebsitePolicies autoplayEnabled]):
(-[_WKWebsitePolicies setAutoplayPolicy:]): Replaced.
(-[_WKWebsitePolicies autoplayPolicy]): Replaced.</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 (210736 => 210737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-13 19:00:29 UTC (rev 210736)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-13 19:16:34 UTC (rev 210737)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2017-01-13 Matt Rajca <mrajca@apple.com>
+
+ Defer use of autoplay heuristics to clients
+ https://bugs.webkit.org/show_bug.cgi?id=167010
+
+ Reviewed by Alex Christensen.
+
+ Switch the autoplay policy tristate to an on/off option since clients should run any
+ heuristics and simply send their final decision to WebKit.
+
+ * Shared/WebsitePolicies.h:
+ (WebKit::WebsitePolicies::encode):
+ (WebKit::WebsitePolicies::decode):
+ * UIProcess/API/APIWebsitePolicies.h:
+ * UIProcess/API/C/WKWebsitePolicies.cpp:
+ (WKWebsitePoliciesGetAutoplayEnabled):
+ (WKWebsitePoliciesSetAutoplayEnabled):
+ (WKWebsitePoliciesGetAutoplayPolicy): Replaced.
+ (WKWebsitePoliciesSetAutoplayPolicy): Replaced.
+ * UIProcess/API/C/WKWebsitePolicies.h:
+ * UIProcess/API/Cocoa/_WKWebsitePolicies.h:
+ * UIProcess/API/Cocoa/_WKWebsitePolicies.mm:
+ (-[_WKWebsitePolicies setAutoplayEnabled:]):
+ (-[_WKWebsitePolicies autoplayEnabled]):
+ (-[_WKWebsitePolicies setAutoplayPolicy:]): Replaced.
+ (-[_WKWebsitePolicies autoplayPolicy]): Replaced.
+
</ins><span class="cx"> 2017-01-13 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] Simplify cookie storage handling
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebsitePoliciesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebsitePolicies.h (210736 => 210737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebsitePolicies.h 2017-01-13 19:00:29 UTC (rev 210736)
+++ trunk/Source/WebKit2/Shared/WebsitePolicies.h 2017-01-13 19:16:34 UTC (rev 210737)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> struct WebsitePolicies {
</span><span class="cx">
</span><span class="cx"> bool contentBlockersEnabled { true };
</span><del>- WebsiteAutoplayPolicy autoplayPolicy { WebsiteAutoplayPolicy::UseHeuristics };
</del><ins>+ bool autoplayEnabled { true };
</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">@@ -45,7 +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><del>- encoder.encodeEnum(autoplayPolicy);
</del><ins>+ encoder << autoplayEnabled;
</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">@@ -52,7 +52,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!decoder.decode(result.contentBlockersEnabled))
</span><span class="cx"> return false;
</span><del>- if (!decoder.decodeEnum(result.autoplayPolicy))
</del><ins>+ if (!decoder.decode(result.autoplayEnabled))
</ins><span class="cx"> return false;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIWebsitePoliciesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIWebsitePolicies.h (210736 => 210737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIWebsitePolicies.h 2017-01-13 19:00:29 UTC (rev 210736)
+++ trunk/Source/WebKit2/UIProcess/API/APIWebsitePolicies.h 2017-01-13 19:16:34 UTC (rev 210737)
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx"> bool contentBlockersEnabled() const { return m_websitePolicies.contentBlockersEnabled; }
</span><span class="cx"> void setContentBlockersEnabled(bool enabled) { m_websitePolicies.contentBlockersEnabled = enabled; }
</span><span class="cx">
</span><del>- WebKit::WebsiteAutoplayPolicy autoplayPolicy() const { return m_websitePolicies.autoplayPolicy; }
- void setAutoplayPolicy(WebKit::WebsiteAutoplayPolicy policy) { m_websitePolicies.autoplayPolicy = policy; }
</del><ins>+ bool autoplayEnabled() const { return m_websitePolicies.autoplayEnabled; }
+ void setAutoplayEnabled(bool enabled) { m_websitePolicies.autoplayEnabled = enabled; }
</ins><span class="cx">
</span><span class="cx"> const WebKit::WebsitePolicies& websitePolicies() { return m_websitePolicies; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKWebsitePoliciescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKWebsitePolicies.cpp (210736 => 210737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKWebsitePolicies.cpp 2017-01-13 19:00:29 UTC (rev 210736)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKWebsitePolicies.cpp 2017-01-13 19:16:34 UTC (rev 210737)
</span><span class="lines">@@ -52,32 +52,12 @@
</span><span class="cx"> return toImpl(websitePolicies)->contentBlockersEnabled();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WKWebsiteAutoplayPolicy WKWebsitePoliciesGetAutoplayPolicy(WKWebsitePoliciesRef websitePolicies)
</del><ins>+bool WKWebsitePoliciesGetAutoplayEnabled(WKWebsitePoliciesRef websitePolicies)
</ins><span class="cx"> {
</span><del>- switch (toImpl(websitePolicies)->autoplayPolicy()) {
- case WebsiteAutoplayPolicy::AlwaysAllow:
- return kWKWebsiteAutoplayPolicyAlwaysAllow;
- case WebsiteAutoplayPolicy::AlwaysDeny:
- return kWKWebsiteAutoplayPolicyAlwaysDeny;
- case WebsiteAutoplayPolicy::UseHeuristics:
- return kWKWebsiteAutoplayPolicyUseHeuristics;
- }
- ASSERT_NOT_REACHED();
- return kWKWebsiteAutoplayPolicyUseHeuristics;
</del><ins>+ return toImpl(websitePolicies)->autoplayEnabled();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WKWebsitePoliciesSetAutoplayPolicy(WKWebsitePoliciesRef websitePolicies, WKWebsiteAutoplayPolicy autoplayPolicy)
</del><ins>+void WKWebsitePoliciesSetAutoplayEnabled(WKWebsitePoliciesRef websitePolicies, bool enabled)
</ins><span class="cx"> {
</span><del>- switch (autoplayPolicy) {
- case kWKWebsiteAutoplayPolicyAlwaysAllow:
- toImpl(websitePolicies)->setAutoplayPolicy(WebsiteAutoplayPolicy::AlwaysAllow);
- return;
- case kWKWebsiteAutoplayPolicyAlwaysDeny:
- toImpl(websitePolicies)->setAutoplayPolicy(WebsiteAutoplayPolicy::AlwaysDeny);
- return;
- case kWKWebsiteAutoplayPolicyUseHeuristics:
- toImpl(websitePolicies)->setAutoplayPolicy(WebsiteAutoplayPolicy::UseHeuristics);
- return;
- }
- ASSERT_NOT_REACHED();
</del><ins>+ toImpl(websitePolicies)->setAutoplayEnabled(enabled);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKWebsitePoliciesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKWebsitePolicies.h (210736 => 210737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKWebsitePolicies.h 2017-01-13 19:00:29 UTC (rev 210736)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKWebsitePolicies.h 2017-01-13 19:16:34 UTC (rev 210737)
</span><span class="lines">@@ -44,8 +44,8 @@
</span><span class="cx"> WK_EXPORT bool WKWebsitePoliciesGetContentBlockersEnabled(WKWebsitePoliciesRef);
</span><span class="cx"> WK_EXPORT void WKWebsitePoliciesSetContentBlockersEnabled(WKWebsitePoliciesRef, bool);
</span><span class="cx">
</span><del>-WK_EXPORT WKWebsiteAutoplayPolicy WKWebsitePoliciesGetAutoplayPolicy(WKWebsitePoliciesRef);
-WK_EXPORT void WKWebsitePoliciesSetAutoplayPolicy(WKWebsitePoliciesRef, WKWebsiteAutoplayPolicy);
</del><ins>+WK_EXPORT bool WKWebsitePoliciesGetAutoplayEnabled(WKWebsitePoliciesRef);
+WK_EXPORT void WKWebsitePoliciesSetAutoplayEnabled(WKWebsitePoliciesRef, bool);
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsitePoliciesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsitePolicies.h (210736 => 210737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsitePolicies.h 2017-01-13 19:00:29 UTC (rev 210736)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsitePolicies.h 2017-01-13 19:16:34 UTC (rev 210737)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> @interface _WKWebsitePolicies : NSObject
</span><span class="cx">
</span><span class="cx"> @property (nonatomic) BOOL contentBlockersEnabled;
</span><del>-@property (nonatomic) _WKWebsiteAutoplayPolicy autoplayPolicy;
</del><ins>+@property (nonatomic) BOOL autoplayEnabled;
</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 (210736 => 210737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsitePolicies.mm 2017-01-13 19:00:29 UTC (rev 210736)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsitePolicies.mm 2017-01-13 19:16:34 UTC (rev 210737)
</span><span class="lines">@@ -57,31 +57,14 @@
</span><span class="cx"> return _websitePolicies->contentBlockersEnabled();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setAutoplayPolicy:(_WKWebsiteAutoplayPolicy)autoplayPolicy
</del><ins>+- (void)setAutoplayEnabled:(BOOL)enabled
</ins><span class="cx"> {
</span><del>- 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;
- }
</del><ins>+ _websitePolicies->setAutoplayEnabled(enabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (_WKWebsiteAutoplayPolicy)autoplayPolicy
</del><ins>+- (BOOL)autoplayEnabled
</ins><span class="cx"> {
</span><del>- switch (_websitePolicies->autoplayPolicy()) {
- case WebKit::WebsiteAutoplayPolicy::UseHeuristics:
- return _WKWebsiteAutoplayPolicyUseHeuristics;
- case WebKit::WebsiteAutoplayPolicy::AlwaysAllow:
- return _WKWebsiteAutoplayPolicyAlwaysAllow;
- case WebKit::WebsiteAutoplayPolicy::AlwaysDeny:
- return _WKWebsiteAutoplayPolicyAlwaysDeny;
- }
</del><ins>+ return _websitePolicies->autoplayEnabled();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)description
</span></span></pre>
</div>
</div>
</body>
</html>