<!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>[196341] 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/196341">196341</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-02-09 15:04:27 -0800 (Tue, 09 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add SPI to remove individual user scripts or user style sheets
https://bugs.webkit.org/show_bug.cgi?id=154046
rdar://problem/23596352
Reviewed by Sam Weinig.
* UIProcess/API/Cocoa/WKUserContentController.mm:
(-[WKUserContentController _removeUserScript:]):
(-[WKUserContentController _userStyleSheets]):
(-[WKUserContentController _addUserStyleSheet:]):
(-[WKUserContentController _removeUserStyleSheet:]):
* UIProcess/API/Cocoa/WKUserContentControllerPrivate.h:
* UIProcess/UserContent/WebUserContentControllerProxy.cpp:
(WebKit::WebUserContentControllerProxy::WebUserContentControllerProxy):
(WebKit::WebUserContentControllerProxy::addProcess):
(WebKit::WebUserContentControllerProxy::removeUserScript):
(WebKit::WebUserContentControllerProxy::addUserStyleSheet):
(WebKit::WebUserContentControllerProxy::removeUserStyleSheet):
(WebKit::WebUserContentControllerProxy::removeAllUserStyleSheets):
* UIProcess/UserContent/WebUserContentControllerProxy.h:
(WebKit::WebUserContentControllerProxy::userStyleSheets):
* WebProcess/UserContent/WebUserContentController.cpp:
(WebKit::WebUserContentController::removeUserScript):
(WebKit::WebUserContentController::removeUserStyleSheet):
* WebProcess/UserContent/WebUserContentController.h:
* WebProcess/UserContent/WebUserContentController.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllerPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessUserContentWebUserContentControllerProxycpp">trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessUserContentWebUserContentControllerProxyh">trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessUserContentWebUserContentControllercpp">trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessUserContentWebUserContentControllerh">trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessUserContentWebUserContentControllermessagesin">trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.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 (196340 => 196341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2016-02-09 23:00:09 UTC (rev 196340)
+++ trunk/Source/WebKit2/ChangeLog        2016-02-09 23:04:27 UTC (rev 196341)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-02-09 Anders Carlsson <andersca@apple.com>
+
+ Add SPI to remove individual user scripts or user style sheets
+ https://bugs.webkit.org/show_bug.cgi?id=154046
+ rdar://problem/23596352
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/API/Cocoa/WKUserContentController.mm:
+ (-[WKUserContentController _removeUserScript:]):
+ (-[WKUserContentController _userStyleSheets]):
+ (-[WKUserContentController _addUserStyleSheet:]):
+ (-[WKUserContentController _removeUserStyleSheet:]):
+ * UIProcess/API/Cocoa/WKUserContentControllerPrivate.h:
+ * UIProcess/UserContent/WebUserContentControllerProxy.cpp:
+ (WebKit::WebUserContentControllerProxy::WebUserContentControllerProxy):
+ (WebKit::WebUserContentControllerProxy::addProcess):
+ (WebKit::WebUserContentControllerProxy::removeUserScript):
+ (WebKit::WebUserContentControllerProxy::addUserStyleSheet):
+ (WebKit::WebUserContentControllerProxy::removeUserStyleSheet):
+ (WebKit::WebUserContentControllerProxy::removeAllUserStyleSheets):
+ * UIProcess/UserContent/WebUserContentControllerProxy.h:
+ (WebKit::WebUserContentControllerProxy::userStyleSheets):
+ * WebProcess/UserContent/WebUserContentController.cpp:
+ (WebKit::WebUserContentController::removeUserScript):
+ (WebKit::WebUserContentController::removeUserStyleSheet):
+ * WebProcess/UserContent/WebUserContentController.h:
+ * WebProcess/UserContent/WebUserContentController.messages.in:
+
</ins><span class="cx"> 2016-02-07 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> GetValueFunc/PutValueFunc should not take both slotBase and thisValue
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm (196340 => 196341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm        2016-02-09 23:00:09 UTC (rev 196340)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm        2016-02-09 23:04:27 UTC (rev 196341)
</span><span class="lines">@@ -126,6 +126,11 @@
</span><span class="cx">
</span><span class="cx"> @implementation WKUserContentController (WKPrivate)
</span><span class="cx">
</span><ins>+- (void)_removeUserScript:(WKUserScript *)userScript
+{
+ _userContentControllerProxy->removeUserScript(*userScript->_userScript);
+}
+
</ins><span class="cx"> - (void)_addUserContentFilter:(_WKUserContentFilter *)userContentFilter
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><span class="lines">@@ -147,11 +152,21 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSArray *)_userStyleSheets
+{
+ return wrapper(_userContentControllerProxy->userStyleSheets());
+}
+
</ins><span class="cx"> - (void)_addUserStyleSheet:(_WKUserStyleSheet *)userStyleSheet
</span><span class="cx"> {
</span><del>- _userContentControllerProxy->addUserStyleSheet(userStyleSheet->_userStyleSheet->userStyleSheet());
</del><ins>+ _userContentControllerProxy->addUserStyleSheet(*userStyleSheet->_userStyleSheet);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_removeUserStyleSheet:(_WKUserStyleSheet *)userStyleSheet
+{
+ _userContentControllerProxy->removeUserStyleSheet(*userStyleSheet->_userStyleSheet);
+}
+
</ins><span class="cx"> - (void)_removeAllUserStyleSheets
</span><span class="cx"> {
</span><span class="cx"> _userContentControllerProxy->removeAllUserStyleSheets();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h (196340 => 196341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h        2016-02-09 23:00:09 UTC (rev 196340)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h        2016-02-09 23:04:27 UTC (rev 196341)
</span><span class="lines">@@ -27,16 +27,21 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+@class WKUserScript;
</ins><span class="cx"> @class _WKUserContentFilter;
</span><span class="cx"> @class _WKUserStyleSheet;
</span><span class="cx">
</span><span class="cx"> @interface WKUserContentController (WKPrivate)
</span><span class="cx">
</span><ins>+- (void)_removeUserScript:(WKUserScript *)userScript WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
</ins><span class="cx"> - (void)_addUserContentFilter:(_WKUserContentFilter *)userContentFilter WK_AVAILABLE(10_11, 9_0);
</span><span class="cx"> - (void)_removeUserContentFilter:(NSString *)userContentFilterName WK_AVAILABLE(10_11, 9_0);
</span><span class="cx"> - (void)_removeAllUserContentFilters WK_AVAILABLE(10_11, 9_0);
</span><span class="cx">
</span><ins>+@property (nonatomic, readonly, copy) WK_ARRAY(_WKUserStyleSheet *) *_userStyleSheets WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</ins><span class="cx"> - (void)_addUserStyleSheet:(_WKUserStyleSheet *)userStyleSheet WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><ins>+- (void)_removeUserStyleSheet:(_WKUserStyleSheet *)userStyleSheet WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</ins><span class="cx"> - (void)_removeAllUserStyleSheets WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserContentWebUserContentControllerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp (196340 => 196341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp        2016-02-09 23:00:09 UTC (rev 196340)
+++ trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp        2016-02-09 23:04:27 UTC (rev 196341)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><span class="cx"> #include "APIUserScript.h"
</span><ins>+#include "APIUserStyleSheet.h"
</ins><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "WebProcessProxy.h"
</span><span class="cx"> #include "WebScriptMessageHandler.h"
</span><span class="lines">@@ -52,6 +53,7 @@
</span><span class="cx"> WebUserContentControllerProxy::WebUserContentControllerProxy()
</span><span class="cx"> : m_identifier(generateIdentifier())
</span><span class="cx"> , m_userScripts(API::Array::create())
</span><ins>+ , m_userStyleSheets(API::Array::create())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -77,7 +79,10 @@
</span><span class="cx"> userScripts.append(userScript->userScript());
</span><span class="cx"> webProcessProxy.connection()->send(Messages::WebUserContentController::AddUserScripts(userScripts), m_identifier);
</span><span class="cx">
</span><del>- webProcessProxy.connection()->send(Messages::WebUserContentController::AddUserStyleSheets(m_userStyleSheets), m_identifier);
</del><ins>+ Vector<WebCore::UserStyleSheet> userStyleSheets;
+ for (const auto& userStyleSheet : m_userScripts->elementsOfType<API::UserStyleSheet>())
+ userStyleSheets.append(userStyleSheet->userStyleSheet());
+ webProcessProxy.connection()->send(Messages::WebUserContentController::AddUserStyleSheets(userStyleSheets), m_identifier);
</ins><span class="cx">
</span><span class="cx"> Vector<WebScriptMessageHandlerHandle> messageHandlerHandles;
</span><span class="cx"> for (auto& handler : m_scriptMessageHandlers.values())
</span><span class="lines">@@ -108,6 +113,14 @@
</span><span class="cx"> process->connection()->send(Messages::WebUserContentController::AddUserScripts({ userScript.userScript() }), m_identifier);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebUserContentControllerProxy::removeUserScript(const API::UserScript& userScript)
+{
+ for (WebProcessProxy* process : m_processes)
+ process->connection()->send(Messages::WebUserContentController::RemoveUserScript({ userScript.userScript().url().string() }), m_identifier);
+
+ m_userScripts->elements().removeAll(&userScript);
+}
+
</ins><span class="cx"> void WebUserContentControllerProxy::removeAllUserScripts()
</span><span class="cx"> {
</span><span class="cx"> m_userScripts->elements().clear();
</span><span class="lines">@@ -116,17 +129,25 @@
</span><span class="cx"> process->connection()->send(Messages::WebUserContentController::RemoveAllUserScripts(), m_identifier);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebUserContentControllerProxy::addUserStyleSheet(WebCore::UserStyleSheet userStyleSheet)
</del><ins>+void WebUserContentControllerProxy::addUserStyleSheet(API::UserStyleSheet& userStyleSheet)
</ins><span class="cx"> {
</span><del>- m_userStyleSheets.append(WTFMove(userStyleSheet));
</del><ins>+ m_userStyleSheets->elements().append(&userStyleSheet);
</ins><span class="cx">
</span><span class="cx"> for (WebProcessProxy* process : m_processes)
</span><del>- process->connection()->send(Messages::WebUserContentController::AddUserStyleSheets({ m_userStyleSheets.last() }), m_identifier);
</del><ins>+ process->connection()->send(Messages::WebUserContentController::AddUserStyleSheets({ userStyleSheet.userStyleSheet() }), m_identifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebUserContentControllerProxy::removeUserStyleSheet(const API::UserStyleSheet& userStyleSheet)
+{
+ for (WebProcessProxy* process : m_processes)
+ process->connection()->send(Messages::WebUserContentController::RemoveUserStyleSheet({ userStyleSheet.userStyleSheet().url().string() }), m_identifier);
+
+ m_userStyleSheets->elements().removeAll(&userStyleSheet);
+}
+
</ins><span class="cx"> void WebUserContentControllerProxy::removeAllUserStyleSheets()
</span><span class="cx"> {
</span><del>- m_userStyleSheets.clear();
</del><ins>+ m_userStyleSheets->elements().clear();
</ins><span class="cx">
</span><span class="cx"> for (WebProcessProxy* process : m_processes)
</span><span class="cx"> process->connection()->send(Messages::WebUserContentController::RemoveAllUserStyleSheets(), m_identifier);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserContentWebUserContentControllerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h (196340 => 196341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h        2016-02-09 23:00:09 UTC (rev 196340)
+++ trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h        2016-02-09 23:04:27 UTC (rev 196341)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> class Array;
</span><span class="cx"> class UserContentExtension;
</span><span class="cx"> class UserScript;
</span><ins>+class UserStyleSheet;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="lines">@@ -48,8 +49,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-class UserScript;
-class UserStyleSheet;
</del><span class="cx"> struct SecurityOriginData;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -74,9 +73,12 @@
</span><span class="cx">
</span><span class="cx"> API::Array& userScripts() { return m_userScripts.get(); }
</span><span class="cx"> void addUserScript(API::UserScript&);
</span><ins>+ void removeUserScript(const API::UserScript&);
</ins><span class="cx"> void removeAllUserScripts();
</span><span class="cx">
</span><del>- void addUserStyleSheet(WebCore::UserStyleSheet);
</del><ins>+ API::Array& userStyleSheets() { return m_userStyleSheets.get(); }
+ void addUserStyleSheet(API::UserStyleSheet&);
+ void removeUserStyleSheet(const API::UserStyleSheet&);
</ins><span class="cx"> void removeAllUserStyleSheets();
</span><span class="cx">
</span><span class="cx"> // Returns false if there was a name conflict.
</span><span class="lines">@@ -98,7 +100,7 @@
</span><span class="cx"> uint64_t m_identifier;
</span><span class="cx"> HashSet<WebProcessProxy*> m_processes;
</span><span class="cx"> Ref<API::Array> m_userScripts;
</span><del>- Vector<WebCore::UserStyleSheet> m_userStyleSheets;
</del><ins>+ Ref<API::Array> m_userStyleSheets;
</ins><span class="cx"> HashMap<uint64_t, RefPtr<WebScriptMessageHandler>> m_scriptMessageHandlers;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessUserContentWebUserContentControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp (196340 => 196341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp        2016-02-09 23:00:09 UTC (rev 196340)
+++ trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp        2016-02-09 23:04:27 UTC (rev 196341)
</span><span class="lines">@@ -90,6 +90,11 @@
</span><span class="cx"> m_userContentController->addUserScript(mainThreadNormalWorld(), std::make_unique<WebCore::UserScript>(userScript));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebUserContentController::removeUserScript(const String& urlString)
+{
+ m_userContentController->removeUserScript(mainThreadNormalWorld(), URL(URL(), urlString));
+}
+
</ins><span class="cx"> void WebUserContentController::removeAllUserScripts()
</span><span class="cx"> {
</span><span class="cx"> m_userContentController->removeUserScripts(mainThreadNormalWorld());
</span><span class="lines">@@ -103,6 +108,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebUserContentController::removeUserStyleSheet(const String& urlString)
+{
+ m_userContentController->removeUserStyleSheet(mainThreadNormalWorld(), URL(URL(), urlString));
+}
+
</ins><span class="cx"> void WebUserContentController::removeAllUserStyleSheets()
</span><span class="cx"> {
</span><span class="cx"> m_userContentController->removeUserStyleSheets(mainThreadNormalWorld());
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessUserContentWebUserContentControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.h (196340 => 196341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.h        2016-02-09 23:00:09 UTC (rev 196340)
+++ trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.h        2016-02-09 23:04:27 UTC (rev 196341)
</span><span class="lines">@@ -53,9 +53,11 @@
</span><span class="cx"> virtual void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
</span><span class="cx">
</span><span class="cx"> void addUserScripts(const Vector<WebCore::UserScript>&);
</span><ins>+ void removeUserScript(const String& urlString);
</ins><span class="cx"> void removeAllUserScripts();
</span><span class="cx">
</span><span class="cx"> void addUserStyleSheets(const Vector<WebCore::UserStyleSheet>&);
</span><ins>+ void removeUserStyleSheet(const String& urlString);
</ins><span class="cx"> void removeAllUserStyleSheets();
</span><span class="cx">
</span><span class="cx"> void addUserScriptMessageHandlers(const Vector<WebScriptMessageHandlerHandle>&);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessUserContentWebUserContentControllermessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.messages.in (196340 => 196341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.messages.in        2016-02-09 23:00:09 UTC (rev 196340)
+++ trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.messages.in        2016-02-09 23:04:27 UTC (rev 196341)
</span><span class="lines">@@ -25,9 +25,11 @@
</span><span class="cx">
</span><span class="cx"> messages -> WebUserContentController {
</span><span class="cx"> AddUserScripts(Vector<WebCore::UserScript> userScripts);
</span><ins>+ RemoveUserScript(String url);
</ins><span class="cx"> RemoveAllUserScripts();
</span><span class="cx">
</span><span class="cx"> AddUserStyleSheets(Vector<WebCore::UserStyleSheet> userStyleSheets);
</span><ins>+ RemoveUserStyleSheet(String url);
</ins><span class="cx"> RemoveAllUserStyleSheets();
</span><span class="cx">
</span><span class="cx"> AddUserScriptMessageHandlers(Vector<WebKit::WebScriptMessageHandlerHandle> scriptMessageHandlers);
</span></span></pre>
</div>
</div>
</body>
</html>