<!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>[178869] 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/178869">178869</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2015-01-21 15:44:35 -0800 (Wed, 21 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add WKPageGroupRef SPI for user content filters
https://bugs.webkit.org/show_bug.cgi?id=140728
Reviewed by Anders Carlsson.
While Safari is transitioning to WKUserContentController, it is useful
for them to have access to have access to content filters on the page group
where they currently have user content related functionality.
* Shared/WebPageGroupData.cpp:
(WebKit::WebPageGroupData::encode):
(WebKit::WebPageGroupData::decode):
* Shared/WebPageGroupData.h:
* UIProcess/API/C/WKPageGroup.cpp:
(WKPageGroupAddUserContentFilter):
(WKPageGroupRemoveAllUserContentFilters):
* UIProcess/API/C/WKPageGroup.h:
* UIProcess/WebPageGroup.cpp:
(WebKit::WebPageGroup::addUserContentFilter):
(WebKit::WebPageGroup::removeAllUserContentFilters):
* UIProcess/WebPageGroup.h:
* WebProcess/WebPage/WebPageGroupProxy.cpp:
(WebKit::WebPageGroupProxy::WebPageGroupProxy):
(WebKit::WebPageGroupProxy::addUserContentFilter):
(WebKit::WebPageGroupProxy::removeAllUserContentFilters):
* WebProcess/WebPage/WebPageGroupProxy.h:
* WebProcess/WebPage/WebPageGroupProxy.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageGroupDatacpp">trunk/Source/WebKit2/Shared/WebPageGroupData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageGroupDatah">trunk/Source/WebKit2/Shared/WebPageGroupData.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageGroupcpp">trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageGrouph">trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageGroupcpp">trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageGrouph">trunk/Source/WebKit2/UIProcess/WebPageGroup.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageGroupProxycpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageGroupProxyh">trunk/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageGroupProxymessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178868 => 178869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-21 23:42:14 UTC (rev 178868)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-21 23:44:35 UTC (rev 178869)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-01-21 Sam Weinig <sam@webkit.org>
+
+ Add WKPageGroupRef SPI for user content filters
+ https://bugs.webkit.org/show_bug.cgi?id=140728
+
+ Reviewed by Anders Carlsson.
+
+ While Safari is transitioning to WKUserContentController, it is useful
+ for them to have access to have access to content filters on the page group
+ where they currently have user content related functionality.
+
+ * Shared/WebPageGroupData.cpp:
+ (WebKit::WebPageGroupData::encode):
+ (WebKit::WebPageGroupData::decode):
+ * Shared/WebPageGroupData.h:
+ * UIProcess/API/C/WKPageGroup.cpp:
+ (WKPageGroupAddUserContentFilter):
+ (WKPageGroupRemoveAllUserContentFilters):
+ * UIProcess/API/C/WKPageGroup.h:
+ * UIProcess/WebPageGroup.cpp:
+ (WebKit::WebPageGroup::addUserContentFilter):
+ (WebKit::WebPageGroup::removeAllUserContentFilters):
+ * UIProcess/WebPageGroup.h:
+ * WebProcess/WebPage/WebPageGroupProxy.cpp:
+ (WebKit::WebPageGroupProxy::WebPageGroupProxy):
+ (WebKit::WebPageGroupProxy::addUserContentFilter):
+ (WebKit::WebPageGroupProxy::removeAllUserContentFilters):
+ * WebProcess/WebPage/WebPageGroupProxy.h:
+ * WebProcess/WebPage/WebPageGroupProxy.messages.in:
+
</ins><span class="cx"> 2015-01-21 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash in QuickLook preview delegate method
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageGroupDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageGroupData.cpp (178868 => 178869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageGroupData.cpp 2015-01-21 23:42:14 UTC (rev 178868)
+++ trunk/Source/WebKit2/Shared/WebPageGroupData.cpp 2015-01-21 23:44:35 UTC (rev 178869)
</span><span class="lines">@@ -38,6 +38,9 @@
</span><span class="cx"> encoder << visibleToHistoryClient;
</span><span class="cx"> encoder << userStyleSheets;
</span><span class="cx"> encoder << userScripts;
</span><ins>+#if ENABLE(CONTENT_EXTENSIONS)
+ encoder << userContentFilters;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebPageGroupData::decode(IPC::ArgumentDecoder& decoder, WebPageGroupData& data)
</span><span class="lines">@@ -54,6 +57,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(data.userScripts))
</span><span class="cx"> return false;
</span><ins>+#if ENABLE(CONTENT_EXTENSIONS)
+ if (!decoder.decode(data.userContentFilters))
+ return false;
+#endif
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageGroupDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageGroupData.h (178868 => 178869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageGroupData.h 2015-01-21 23:42:14 UTC (rev 178868)
+++ trunk/Source/WebKit2/Shared/WebPageGroupData.h 2015-01-21 23:44:35 UTC (rev 178869)
</span><span class="lines">@@ -49,6 +49,10 @@
</span><span class="cx">
</span><span class="cx"> Vector<WebCore::UserStyleSheet> userStyleSheets;
</span><span class="cx"> Vector<WebCore::UserScript> userScripts;
</span><ins>+
+#if ENABLE(CONTENT_EXTENSIONS)
+ Vector<std::pair<String, String>> userContentFilters;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.cpp (178868 => 178869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.cpp 2015-01-21 23:42:14 UTC (rev 178868)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.cpp 2015-01-21 23:44:35 UTC (rev 178869)
</span><span class="lines">@@ -77,3 +77,17 @@
</span><span class="cx"> {
</span><span class="cx"> toImpl(pageGroupRef)->removeAllUserScripts();
</span><span class="cx"> }
</span><ins>+
+void WKPageGroupAddUserContentFilter(WKPageGroupRef pageGroupRef, WKUserContentFilterRef userContentFilterRef)
+{
+#if ENABLE(CONTENT_EXTENSIONS)
+ toImpl(pageGroupRef)->addUserContentFilter(*toImpl(userContentFilterRef));
+#endif
+}
+
+void WKPageGroupRemoveAllUserContentFilters(WKPageGroupRef pageGroupRef)
+{
+#if ENABLE(CONTENT_EXTENSIONS)
+ toImpl(pageGroupRef)->removeAllUserScripts();
+#endif
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.h (178868 => 178869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.h 2015-01-21 23:42:14 UTC (rev 178868)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.h 2015-01-21 23:44:35 UTC (rev 178869)
</span><span class="lines">@@ -49,6 +49,9 @@
</span><span class="cx"> WK_EXPORT void WKPageGroupAddUserScript(WKPageGroupRef pageGroup, WKStringRef source, WKURLRef baseURL, WKArrayRef whitelistedURLPatterns, WKArrayRef blacklistedURLPatterns, WKUserContentInjectedFrames, _WKUserScriptInjectionTime);
</span><span class="cx"> WK_EXPORT void WKPageGroupRemoveAllUserScripts(WKPageGroupRef pageGroup);
</span><span class="cx">
</span><ins>+WK_EXPORT void WKPageGroupAddUserContentFilter(WKPageGroupRef pageGroup, WKUserContentFilterRef userContentFilter);
+WK_EXPORT void WKPageGroupRemoveAllUserContentFilters(WKPageGroupRef pageGroup);
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp (178868 => 178869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp 2015-01-21 23:42:14 UTC (rev 178868)
+++ trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp 2015-01-21 23:44:35 UTC (rev 178869)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "WebPageGroup.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APIUserContentFilter.h"
</ins><span class="cx"> #include "WebPageGroupProxyMessages.h"
</span><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx"> #include "WebPreferences.h"
</span><span class="lines">@@ -171,4 +172,18 @@
</span><span class="cx"> sendToAllProcessesInGroup(Messages::WebPageGroupProxy::RemoveAllUserContent(), m_data.pageGroupID);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_EXTENSIONS)
+void WebPageGroup::addUserContentFilter(const API::UserContentFilter& userContentFilter)
+{
+ m_data.userContentFilters.append(std::make_pair(userContentFilter.name(), userContentFilter.serializedRules()));
+ sendToAllProcessesInGroup(Messages::WebPageGroupProxy::AddUserContentFilter(userContentFilter.name(), userContentFilter.serializedRules()), m_data.pageGroupID);
+}
+
+void WebPageGroup::removeAllUserContentFilters()
+{
+ m_data.userContentFilters.clear();
+ sendToAllProcessesInGroup(Messages::WebPageGroupProxy::RemoveAllUserContentFilters(), m_data.pageGroupID);
+}
+#endif
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageGroup.h (178868 => 178869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageGroup.h 2015-01-21 23:42:14 UTC (rev 178868)
+++ trunk/Source/WebKit2/UIProcess/WebPageGroup.h 2015-01-21 23:44:35 UTC (rev 178869)
</span><span class="lines">@@ -65,6 +65,11 @@
</span><span class="cx"> void removeAllUserScripts();
</span><span class="cx"> void removeAllUserContent();
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_EXTENSIONS)
+ void addUserContentFilter(const API::UserContentFilter&);
+ void removeAllUserContentFilters();
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> template<typename T> void sendToAllProcessesInGroup(const T&, uint64_t destinationID);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageGroupProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.cpp (178868 => 178869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.cpp 2015-01-21 23:42:14 UTC (rev 178868)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.cpp 2015-01-21 23:44:35 UTC (rev 178869)
</span><span class="lines">@@ -48,10 +48,15 @@
</span><span class="cx"> : m_data(data)
</span><span class="cx"> , m_pageGroup(WebCore::PageGroup::pageGroup(m_data.identifier))
</span><span class="cx"> {
</span><del>- for (size_t i = 0; i < data.userStyleSheets.size(); ++i)
- addUserStyleSheet(data.userStyleSheets[i]);
- for (size_t i = 0; i < data.userScripts.size(); ++i)
- addUserScript(data.userScripts[i]);
</del><ins>+ for (const auto& userStyleSheet : data.userStyleSheets)
+ addUserStyleSheet(userStyleSheet);
+ for (const auto& userScript : data.userScripts)
+ addUserScript(userScript);
+
+#if ENABLE(CONTENT_EXTENSIONS)
+ for (const auto& pair : data.userContentFilters)
+ addUserContentFilter(pair.first, pair.second);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebPageGroupProxy::~WebPageGroupProxy()
</span><span class="lines">@@ -91,4 +96,16 @@
</span><span class="cx"> userContentController().removeAllUserContent();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_EXTENSIONS)
+void WebPageGroupProxy::addUserContentFilter(const String& name, const String& serializedRules)
+{
+ userContentController().addUserContentFilter(name, serializedRules);
+}
+
+void WebPageGroupProxy::removeAllUserContentFilters()
+{
+ userContentController().removeAllUserContentFilters();
+}
+#endif
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageGroupProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.h (178868 => 178869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.h 2015-01-21 23:42:14 UTC (rev 178868)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.h 2015-01-21 23:44:35 UTC (rev 178869)
</span><span class="lines">@@ -63,6 +63,11 @@
</span><span class="cx"> void removeAllUserScripts();
</span><span class="cx"> void removeAllUserContent();
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_EXTENSIONS)
+ void addUserContentFilter(const String& name, const String& serializedRules);
+ void removeAllUserContentFilters();
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> WebPageGroupProxy(const WebPageGroupData&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageGroupProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.messages.in (178868 => 178869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.messages.in 2015-01-21 23:42:14 UTC (rev 178868)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.messages.in 2015-01-21 23:44:35 UTC (rev 178869)
</span><span class="lines">@@ -26,4 +26,9 @@
</span><span class="cx"> RemoveAllUserStyleSheets();
</span><span class="cx"> RemoveAllUserScripts();
</span><span class="cx"> RemoveAllUserContent();
</span><ins>+
+#if ENABLE(CONTENT_EXTENSIONS)
+ AddUserContentFilter(String name, String serializedRules);
+ RemoveAllUserContentFilters();
+#endif
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>