<!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>[207168] 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/207168">207168</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-10-11 15:01:45 -0700 (Tue, 11 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up WebPageGroup somewhat
https://bugs.webkit.org/show_bug.cgi?id=163299
Reviewed by Tim Horton.
* Shared/API/c/WKDeprecatedFunctions.cpp:
(WKPageGroupCopyIdentifier):
Move this here from WKPageGroup.
(WKPageGroupAddUserContentFilter):
(WKPageGroupRemoveUserContentFilter):
(WKPageGroupRemoveAllUserContentFilters):
Just call directly into the user content controller.
* UIProcess/API/C/WKPageGroup.cpp:
(WKPageGroupAddUserStyleSheet):
(WKPageGroupRemoveAllUserStyleSheets):
(WKPageGroupAddUserScript):
(WKPageGroupRemoveAllUserScripts):
Just call directly into the user content controller.
* UIProcess/API/C/WKPageGroup.h:
* UIProcess/WebPageGroup.cpp:
(WebKit::WebPageGroup::addUserStyleSheet): Deleted.
(WebKit::WebPageGroup::addUserScript): Deleted.
(WebKit::WebPageGroup::removeAllUserStyleSheets): Deleted.
(WebKit::WebPageGroup::removeAllUserScripts): Deleted.
(WebKit::WebPageGroup::removeAllUserContent): Deleted.
(WebKit::WebPageGroup::addUserContentExtension): Deleted.
(WebKit::WebPageGroup::removeUserContentExtension): Deleted.
(WebKit::WebPageGroup::removeAllUserContentExtensions): Deleted.
Get rid of these, all their callers just call into the user content controller now.
* UIProcess/WebPageGroup.h:
(WebKit::WebPageGroup::identifier): Deleted.
(WebKit::WebPageGroup::sendToAllProcessesInGroup): Deleted.
Remove unused code.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKDeprecatedFunctionscpp">trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (207167 => 207168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-10-11 21:58:20 UTC (rev 207167)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-11 22:01:45 UTC (rev 207168)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2016-10-11 Anders Carlsson <andersca@apple.com>
+
+ Clean up WebPageGroup somewhat
+ https://bugs.webkit.org/show_bug.cgi?id=163299
+
+ Reviewed by Tim Horton.
+
+ * Shared/API/c/WKDeprecatedFunctions.cpp:
+ (WKPageGroupCopyIdentifier):
+ Move this here from WKPageGroup.
+
+ (WKPageGroupAddUserContentFilter):
+ (WKPageGroupRemoveUserContentFilter):
+ (WKPageGroupRemoveAllUserContentFilters):
+ Just call directly into the user content controller.
+
+ * UIProcess/API/C/WKPageGroup.cpp:
+ (WKPageGroupAddUserStyleSheet):
+ (WKPageGroupRemoveAllUserStyleSheets):
+ (WKPageGroupAddUserScript):
+ (WKPageGroupRemoveAllUserScripts):
+ Just call directly into the user content controller.
+
+ * UIProcess/API/C/WKPageGroup.h:
+ * UIProcess/WebPageGroup.cpp:
+ (WebKit::WebPageGroup::addUserStyleSheet): Deleted.
+ (WebKit::WebPageGroup::addUserScript): Deleted.
+ (WebKit::WebPageGroup::removeAllUserStyleSheets): Deleted.
+ (WebKit::WebPageGroup::removeAllUserScripts): Deleted.
+ (WebKit::WebPageGroup::removeAllUserContent): Deleted.
+ (WebKit::WebPageGroup::addUserContentExtension): Deleted.
+ (WebKit::WebPageGroup::removeUserContentExtension): Deleted.
+ (WebKit::WebPageGroup::removeAllUserContentExtensions): Deleted.
+ Get rid of these, all their callers just call into the user content controller now.
+
+ * UIProcess/WebPageGroup.h:
+ (WebKit::WebPageGroup::identifier): Deleted.
+ (WebKit::WebPageGroup::sendToAllProcessesInGroup): Deleted.
+ Remove unused code.
+
</ins><span class="cx"> 2016-10-11 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] REGRESSION (r197953): User gesture required to load video in iOS 9-built apps
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKDeprecatedFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp (207167 => 207168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2016-10-11 21:58:20 UTC (rev 207167)
+++ trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2016-10-11 22:01:45 UTC (rev 207168)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "WKMutableDictionary.h"
</span><span class="cx"> #include "WKPreferencesRefPrivate.h"
</span><span class="cx"> #include "WebPageGroup.h"
</span><ins>+#include "WebUserContentControllerProxy.h"
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> #include "WKContextPrivateMac.h"
</span><span class="lines">@@ -41,6 +42,7 @@
</span><span class="cx"> // Deprecated functions that should be removed from the framework once nobody uses them.
</span><span class="cx">
</span><span class="cx"> extern "C" {
</span><ins>+WK_EXPORT WKStringRef WKPageGroupCopyIdentifier(WKPageGroupRef pageGroup);
</ins><span class="cx"> WK_EXPORT void WKPageGroupAddUserContentFilter(WKPageGroupRef pageGroup, WKUserContentFilterRef userContentFilter);
</span><span class="cx"> WK_EXPORT void WKPageGroupRemoveUserContentFilter(WKPageGroupRef pageGroup, WKStringRef userContentFilterName);
</span><span class="cx"> WK_EXPORT void WKPageGroupRemoveAllUserContentFilters(WKPageGroupRef pageGroup);
</span><span class="lines">@@ -56,10 +58,15 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WKStringRef WKPageGroupCopyIdentifier(WKPageGroupRef)
+{
+ return nullptr;
+}
+
</ins><span class="cx"> void WKPageGroupAddUserContentFilter(WKPageGroupRef pageGroupRef, WKUserContentFilterRef userContentFilterRef)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><del>- toImpl(pageGroupRef)->addUserContentExtension(*toImpl(userContentFilterRef));
</del><ins>+ toImpl(pageGroupRef)->userContentController().addUserContentExtension(*toImpl(userContentFilterRef));
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(pageGroupRef);
</span><span class="cx"> UNUSED_PARAM(userContentFilterRef);
</span><span class="lines">@@ -69,7 +76,7 @@
</span><span class="cx"> void WKPageGroupRemoveUserContentFilter(WKPageGroupRef pageGroupRef, WKStringRef userContentFilterNameRef)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><del>- toImpl(pageGroupRef)->removeUserContentExtension(toWTFString(userContentFilterNameRef));
</del><ins>+ toImpl(pageGroupRef)->userContentController().removeUserContentExtension(toWTFString(userContentFilterNameRef));
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(pageGroupRef);
</span><span class="cx"> UNUSED_PARAM(userContentFilterNameRef);
</span><span class="lines">@@ -76,11 +83,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> void WKPageGroupRemoveAllUserContentFilters(WKPageGroupRef pageGroupRef)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><del>- toImpl(pageGroupRef)->removeAllUserContentExtensions();
</del><ins>+ toImpl(pageGroupRef)->userContentController().removeAllUserContentExtensions();
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(pageGroupRef);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.cpp (207167 => 207168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.cpp 2016-10-11 21:58:20 UTC (rev 207167)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.cpp 2016-10-11 22:01:45 UTC (rev 207168)
</span><span class="lines">@@ -27,6 +27,9 @@
</span><span class="cx"> #include "WKPageGroup.h"
</span><span class="cx">
</span><span class="cx"> #include "APIUserContentExtension.h"
</span><ins>+#include "APIUserContentWorld.h"
+#include "APIUserScript.h"
+#include "APIUserStyleSheet.h"
</ins><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WebPageGroup.h"
</span><span class="cx"> #include "WebPreferences.h"
</span><span class="lines">@@ -45,11 +48,6 @@
</span><span class="cx"> return toAPI(pageGroup.leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WKStringRef WKPageGroupCopyIdentifier(WKPageGroupRef pageGroupRef)
-{
- return toCopiedAPI(toImpl(pageGroupRef)->identifier());
-}
-
</del><span class="cx"> void WKPageGroupSetPreferences(WKPageGroupRef pageGroupRef, WKPreferencesRef preferencesRef)
</span><span class="cx"> {
</span><span class="cx"> toImpl(pageGroupRef)->setPreferences(toImpl(preferencesRef));
</span><span class="lines">@@ -65,22 +63,43 @@
</span><span class="cx"> return toAPI(&toImpl(pageGroupRef)->userContentController());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKPageGroupAddUserStyleSheet(WKPageGroupRef pageGroupRef, WKStringRef sourceRef, WKURLRef baseURL, WKArrayRef whitelistedURLPatterns, WKArrayRef blacklistedURLPatterns, WKUserContentInjectedFrames injectedFrames)
</del><ins>+void WKPageGroupAddUserStyleSheet(WKPageGroupRef pageGroupRef, WKStringRef sourceRef, WKURLRef baseURLRef, WKArrayRef whitelistedURLPatterns, WKArrayRef blacklistedURLPatterns, WKUserContentInjectedFrames injectedFrames)
</ins><span class="cx"> {
</span><del>- toImpl(pageGroupRef)->addUserStyleSheet(toWTFString(sourceRef), toWTFString(baseURL), toImpl(whitelistedURLPatterns), toImpl(blacklistedURLPatterns), toUserContentInjectedFrames(injectedFrames), WebCore::UserStyleUserLevel);
</del><ins>+ auto source = toWTFString(sourceRef);
+
+ if (source.isEmpty())
+ return;
+
+ auto baseURLString = toWTFString(baseURLRef);
+ auto whitelist = toImpl(whitelistedURLPatterns);
+ auto blacklist = toImpl(blacklistedURLPatterns);
+
+ Ref<API::UserStyleSheet> userStyleSheet = API::UserStyleSheet::create(WebCore::UserStyleSheet { source, (baseURLString.isEmpty() ? WebCore::blankURL() : WebCore::URL(WebCore::URL(), baseURLString)), whitelist ? whitelist->toStringVector() : Vector<String>(), blacklist ? blacklist->toStringVector() : Vector<String>(), toUserContentInjectedFrames(injectedFrames), WebCore::UserStyleUserLevel }, API::UserContentWorld::normalWorld());
+
+ toImpl(pageGroupRef)->userContentController().addUserStyleSheet(userStyleSheet.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WKPageGroupRemoveAllUserStyleSheets(WKPageGroupRef pageGroupRef)
</del><ins>+void WKPageGroupRemoveAllUserStyleSheets(WKPageGroupRef pageGroup)
</ins><span class="cx"> {
</span><del>- toImpl(pageGroupRef)->removeAllUserStyleSheets();
</del><ins>+ toImpl(pageGroup)->userContentController().removeAllUserStyleSheets();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WKPageGroupAddUserScript(WKPageGroupRef pageGroupRef, WKStringRef sourceRef, WKURLRef baseURL, WKArrayRef whitelistedURLPatterns, WKArrayRef blacklistedURLPatterns, WKUserContentInjectedFrames injectedFrames, _WKUserScriptInjectionTime injectionTime)
</del><ins>+void WKPageGroupAddUserScript(WKPageGroupRef pageGroupRef, WKStringRef sourceRef, WKURLRef baseURLRef, WKArrayRef whitelistedURLPatterns, WKArrayRef blacklistedURLPatterns, WKUserContentInjectedFrames injectedFrames, _WKUserScriptInjectionTime injectionTime)
</ins><span class="cx"> {
</span><del>- toImpl(pageGroupRef)->addUserScript(toWTFString(sourceRef), toWTFString(baseURL), toImpl(whitelistedURLPatterns), toImpl(blacklistedURLPatterns), toUserContentInjectedFrames(injectedFrames), toUserScriptInjectionTime(injectionTime));
</del><ins>+ auto source = toWTFString(sourceRef);
+
+ if (source.isEmpty())
+ return;
+
+ auto baseURLString = toWTFString(baseURLRef);
+ auto whitelist = toImpl(whitelistedURLPatterns);
+ auto blacklist = toImpl(blacklistedURLPatterns);
+
+ Ref<API::UserScript> userScript = API::UserScript::create(WebCore::UserScript { source, (baseURLString.isEmpty() ? WebCore::blankURL() : WebCore::URL(WebCore::URL(), baseURLString)), whitelist ? whitelist->toStringVector() : Vector<String>(), blacklist ? blacklist->toStringVector() : Vector<String>(), toUserScriptInjectionTime(injectionTime), toUserContentInjectedFrames(injectedFrames) }, API::UserContentWorld::normalWorld());
+ toImpl(pageGroupRef)->userContentController().addUserScript(userScript.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKPageGroupRemoveAllUserScripts(WKPageGroupRef pageGroupRef)
</span><span class="cx"> {
</span><del>- toImpl(pageGroupRef)->removeAllUserScripts();
</del><ins>+ toImpl(pageGroupRef)->userContentController().removeAllUserScripts();
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.h (207167 => 207168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.h 2016-10-11 21:58:20 UTC (rev 207167)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.h 2016-10-11 22:01:45 UTC (rev 207168)
</span><span class="lines">@@ -38,8 +38,6 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKPageGroupRef WKPageGroupCreateWithIdentifier(WKStringRef identifier);
</span><span class="cx">
</span><del>-WK_EXPORT WKStringRef WKPageGroupCopyIdentifier(WKPageGroupRef pageGroup);
-
</del><span class="cx"> WK_EXPORT void WKPageGroupSetPreferences(WKPageGroupRef pageGroup, WKPreferencesRef preferences);
</span><span class="cx"> WK_EXPORT WKPreferencesRef WKPageGroupGetPreferences(WKPageGroupRef pageGroup);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp (207167 => 207168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp 2016-10-11 21:58:20 UTC (rev 207167)
+++ trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp 2016-10-11 22:01:45 UTC (rev 207168)
</span><span class="lines">@@ -142,55 +142,4 @@
</span><span class="cx"> return *m_userContentController;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageGroup::addUserStyleSheet(const String& source, const String& baseURL, API::Array* whitelist, API::Array* blacklist, WebCore::UserContentInjectedFrames injectedFrames, WebCore::UserStyleLevel level)
-{
- if (source.isEmpty())
- return;
-
- Ref<API::UserStyleSheet> userStyleSheet = API::UserStyleSheet::create(WebCore::UserStyleSheet { source, (baseURL.isEmpty() ? WebCore::blankURL() : WebCore::URL(WebCore::URL(), baseURL)), whitelist ? whitelist->toStringVector() : Vector<String>(), blacklist ? blacklist->toStringVector() : Vector<String>(), injectedFrames, level }, API::UserContentWorld::normalWorld());
- m_userContentController->addUserStyleSheet(userStyleSheet.get());
-}
-
-void WebPageGroup::addUserScript(const String& source, const String& baseURL, API::Array* whitelist, API::Array* blacklist, WebCore::UserContentInjectedFrames injectedFrames, WebCore::UserScriptInjectionTime injectionTime)
-{
- if (source.isEmpty())
- return;
-
- Ref<API::UserScript> userScript = API::UserScript::create(WebCore::UserScript { source, (baseURL.isEmpty() ? WebCore::blankURL() : WebCore::URL(WebCore::URL(), baseURL)), whitelist ? whitelist->toStringVector() : Vector<String>(), blacklist ? blacklist->toStringVector() : Vector<String>(), injectionTime, injectedFrames }, API::UserContentWorld::normalWorld());
- m_userContentController->addUserScript(userScript.get());
-}
-
-void WebPageGroup::removeAllUserStyleSheets()
-{
- m_userContentController->removeAllUserStyleSheets();
-}
-
-void WebPageGroup::removeAllUserScripts()
-{
- m_userContentController->removeAllUserScripts();
-}
-
-void WebPageGroup::removeAllUserContent()
-{
- m_userContentController->removeAllUserStyleSheets();
- m_userContentController->removeAllUserScripts();
-}
-
-#if ENABLE(CONTENT_EXTENSIONS)
-void WebPageGroup::addUserContentExtension(API::UserContentExtension& userContentExtension)
-{
- m_userContentController->addUserContentExtension(userContentExtension);
-}
-
-void WebPageGroup::removeUserContentExtension(const String& contentExtensionName)
-{
- m_userContentController->removeUserContentExtension(contentExtensionName);
-}
-
-void WebPageGroup::removeAllUserContentExtensions()
-{
- m_userContentController->removeAllUserContentExtensions();
-}
-#endif
-
</del><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageGroup.h (207167 => 207168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageGroup.h 2016-10-11 21:58:20 UTC (rev 207167)
+++ trunk/Source/WebKit2/UIProcess/WebPageGroup.h 2016-10-11 22:01:45 UTC (rev 207168)
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx"> void addPage(WebPageProxy*);
</span><span class="cx"> void removePage(WebPageProxy*);
</span><span class="cx">
</span><del>- const String& identifier() const { return m_data.identifier; }
</del><span class="cx"> uint64_t pageGroupID() const { return m_data.pageGroupID; }
</span><span class="cx">
</span><span class="cx"> const WebPageGroupData& data() const { return m_data; }
</span><span class="lines">@@ -64,21 +63,7 @@
</span><span class="cx">
</span><span class="cx"> WebUserContentControllerProxy& userContentController();
</span><span class="cx">
</span><del>- void addUserStyleSheet(const String& source, const String& baseURL, API::Array* whitelist, API::Array* blacklist, WebCore::UserContentInjectedFrames, WebCore::UserStyleLevel);
- void addUserScript(const String& source, const String& baseURL, API::Array* whitelist, API::Array* blacklist, WebCore::UserContentInjectedFrames, WebCore::UserScriptInjectionTime);
- void removeAllUserStyleSheets();
- void removeAllUserScripts();
- void removeAllUserContent();
-
-#if ENABLE(CONTENT_EXTENSIONS)
- void addUserContentExtension(API::UserContentExtension&);
- void removeUserContentExtension(const String&);
- void removeAllUserContentExtensions();
-#endif
-
</del><span class="cx"> private:
</span><del>- template<typename T> void sendToAllProcessesInGroup(const T&, uint64_t destinationID);
-
</del><span class="cx"> WebPageGroupData m_data;
</span><span class="cx"> RefPtr<WebPreferences> m_preferences;
</span><span class="cx"> RefPtr<WebUserContentControllerProxy> m_userContentController;
</span><span class="lines">@@ -85,21 +70,6 @@
</span><span class="cx"> HashSet<WebPageProxy*> m_pages;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-template<typename T>
-void WebPageGroup::sendToAllProcessesInGroup(const T& message, uint64_t destinationID)
-{
- HashSet<WebProcessProxy*> processesSeen;
-
- for (WebPageProxy* webPageProxy : m_pages) {
- WebProcessProxy& webProcessProxy = webPageProxy->process();
- if (!processesSeen.add(&webProcessProxy).isNewEntry)
- continue;
-
- if (webProcessProxy.canSendMessage())
- webProcessProxy.send(T(message), destinationID);
- }
-}
-
</del><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // WebPageGroup_h
</span></span></pre>
</div>
</div>
</body>
</html>