<!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>[277627] trunk</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/277627">277627</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2021-05-17 18:33:52 -0700 (Mon, 17 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, reverting <a href="http://trac.webkit.org/projects/webkit/changeset/277605">r277605</a>.

Broke iOS tests

Reverted changeset:

"Remove _WKUserContentFilter and _WKUserContentExtensionStore"
https://bugs.webkit.org/show_bug.cgi?id=224391
https://commits.webkit.org/<a href="http://trac.webkit.org/projects/webkit/changeset/277605">r277605</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitSourcesCocoatxt">trunk/Source/WebKit/SourcesCocoa.txt</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKUserContentControllermm">trunk/Source/WebKit/UIProcess/API/Cocoa/WKUserContentController.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKUserContentControllerPrivateh">trunk/Source/WebKit/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessCocoaWebURLSchemeHandlerCocoamm">trunk/Source/WebKit/UIProcess/Cocoa/WebURLSchemeHandlerCocoa.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebProcessPoolh">trunk/Source/WebKit/UIProcess/WebProcessPool.h</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacAppDelegatem">trunk/Tools/MiniBrowser/mac/AppDelegate.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacExtensionManagerWindowControllerm">trunk/Tools/MiniBrowser/mac/ExtensionManagerWindowController.m</a></li>
<li><a href="#trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj">trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaWebsitePoliciesmm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsitePolicies.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnercocoaTestControllerCocoamm">trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnermacTestControllerMacmm">trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitUIProcessAPICocoa_WKUserContentExtensionStoreh">trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentExtensionStore.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoa_WKUserContentExtensionStoremm">trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoa_WKUserContentExtensionStoreInternalh">trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentExtensionStoreInternal.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoa_WKUserContentExtensionStorePrivateh">trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentExtensionStorePrivate.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoa_WKUserContentFilterh">trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilter.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoa_WKUserContentFiltermm">trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilter.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoa_WKUserContentFilterInternalh">trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilterInternal.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoa_WKUserContentFilterPrivateh">trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilterPrivate.h</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoa_WKUserContentExtensionStoremm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/_WKUserContentExtensionStore.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (277626 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-05-18 01:15:29 UTC (rev 277626)
+++ trunk/Source/WebKit/ChangeLog       2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2021-05-17  Alex Christensen  <achristensen@webkit.org>
+
+        Unreviewed, reverting r277605.
+
+        Broke iOS tests
+
+        Reverted changeset:
+
+        "Remove _WKUserContentFilter and _WKUserContentExtensionStore"
+        https://bugs.webkit.org/show_bug.cgi?id=224391
+        https://commits.webkit.org/r277605
+
</ins><span class="cx"> 2021-05-17  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, fix the internal macOS build
</span></span></pre></div>
<a id="trunkSourceWebKitSourcesCocoatxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/SourcesCocoa.txt (277626 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/SourcesCocoa.txt     2021-05-18 01:15:29 UTC (rev 277626)
+++ trunk/Source/WebKit/SourcesCocoa.txt        2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -292,6 +292,8 @@
</span><span class="cx"> UIProcess/API/Cocoa/_WKTextManipulationItem.mm
</span><span class="cx"> UIProcess/API/Cocoa/_WKTextManipulationToken.mm
</span><span class="cx"> UIProcess/API/Cocoa/_WKThumbnailView.mm
</span><ins>+UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm
+UIProcess/API/Cocoa/_WKUserContentFilter.mm
</ins><span class="cx"> UIProcess/API/Cocoa/_WKUserContentWorld.mm
</span><span class="cx"> UIProcess/API/Cocoa/_WKUserInitiatedAction.mm
</span><span class="cx"> UIProcess/API/Cocoa/_WKUserStyleSheet.mm
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKUserContentControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKUserContentController.mm (277626 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKUserContentController.mm       2021-05-18 01:15:29 UTC (rev 277626)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKUserContentController.mm  2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #import "WKWebViewInternal.h"
</span><span class="cx"> #import "WebScriptMessageHandler.h"
</span><span class="cx"> #import "WebUserContentControllerProxy.h"
</span><ins>+#import "_WKUserContentFilterInternal.h"
</ins><span class="cx"> #import "_WKUserContentWorldInternal.h"
</span><span class="cx"> #import "_WKUserStyleSheetInternal.h"
</span><span class="cx"> #import <WebCore/SecurityOrigin.h>
</span><span class="lines">@@ -274,6 +275,13 @@
</span><span class="cx">     _userContentControllerProxy->addUserScript(*userScript->_userScript, WebKit::InjectUserScriptImmediately::Yes);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (void)_addUserContentFilter:(_WKUserContentFilter *)userContentFilter
+{
+#if ENABLE(CONTENT_EXTENSIONS)
+    _userContentControllerProxy->addContentRuleList(*userContentFilter->_contentRuleList->_contentRuleList);
+#endif
+}
+
</ins><span class="cx"> - (void)_removeUserContentFilter:(NSString *)userContentFilterName
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><span class="lines">@@ -281,6 +289,13 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (void)_removeAllUserContentFilters
+{
+#if ENABLE(CONTENT_EXTENSIONS)
+    _userContentControllerProxy->removeAllContentRuleLists();
+#endif
+}
+
</ins><span class="cx"> - (NSArray *)_userStyleSheets
</span><span class="cx"> {
</span><span class="cx">     return wrapper(_userContentControllerProxy->userStyleSheets());
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKUserContentControllerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h (277626 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h 2021-05-18 01:15:29 UTC (rev 277626)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h    2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> 
</span><span class="cx"> @class WKContentWorld;
</span><span class="cx"> @class WKUserScript;
</span><ins>+@class _WKUserContentFilter;
</ins><span class="cx"> @class _WKUserContentWorld;
</span><span class="cx"> @class _WKUserStyleSheet;
</span><span class="cx"> 
</span><span class="lines">@@ -37,7 +38,9 @@
</span><span class="cx"> 
</span><span class="cx"> - (void)_addUserScriptImmediately:(WKUserScript *)userScript WK_API_AVAILABLE(macos(10.14), ios(12.0));
</span><span class="cx"> 
</span><ins>+- (void)_addUserContentFilter:(_WKUserContentFilter *)userContentFilter WK_API_AVAILABLE(macos(10.11), ios(9.0));
</ins><span class="cx"> - (void)_removeUserContentFilter:(NSString *)userContentFilterName WK_API_AVAILABLE(macos(10.11), ios(9.0));
</span><ins>+- (void)_removeAllUserContentFilters WK_API_AVAILABLE(macos(10.11), ios(9.0));
</ins><span class="cx"> 
</span><span class="cx"> @property (nonatomic, readonly, copy) NSArray<_WKUserStyleSheet *> *_userStyleSheets WK_API_AVAILABLE(macos(10.12), ios(10.0));
</span><span class="cx"> - (void)_addUserStyleSheet:(_WKUserStyleSheet *)userStyleSheet WK_API_AVAILABLE(macos(10.12), ios(10.0));
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoa_WKUserContentExtensionStorehfromrev277604trunkSourceWebKitUIProcessAPICocoa_WKUserContentExtensionStoreh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentExtensionStore.h (from rev 277604, trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentExtensionStore.h) (0 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentExtensionStore.h                           (rev 0)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentExtensionStore.h      2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit/WKFoundation.h>
+
+@class _WKUserContentFilter;
+
+WK_CLASS_AVAILABLE(macos(10.11), ios(9.0))
+@interface _WKUserContentExtensionStore : NSObject
+
++ (instancetype)defaultStore;
++ (instancetype)storeWithURL:(NSURL *)url;
+
+- (void)compileContentExtensionForIdentifier:(NSString *)identifier encodedContentExtension:(NSString *) NS_RELEASES_ARGUMENT encodedContentExtension completionHandler:(void (^)(_WKUserContentFilter *, NSError *))completionHandler;
+- (void)lookupContentExtensionForIdentifier:(NSString *)identifier completionHandler:(void (^)(_WKUserContentFilter *, NSError *))completionHandler;
+- (void)removeContentExtensionForIdentifier:(NSString *)identifier completionHandler:(void (^)(NSError *))completionHandler;
+
+@end
+
+WK_EXTERN NSString * const _WKUserContentExtensionsDomain WK_API_AVAILABLE(macos(10.12), ios(10.0));
+
+typedef NS_ENUM(NSInteger, _WKUserContentExtensionStoreErrorCode) {
+    _WKUserContentExtensionStoreErrorLookupFailed,
+    _WKUserContentExtensionStoreErrorVersionMismatch,
+    _WKUserContentExtensionStoreErrorCompileFailed,
+    _WKUserContentExtensionStoreErrorRemoveFailed,
+} WK_API_AVAILABLE(macos(10.12), ios(10.0));
</ins></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoa_WKUserContentExtensionStoremmfromrev277604trunkSourceWebKitUIProcessAPICocoa_WKUserContentExtensionStoremm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm (from rev 277604, trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm) (0 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm                          (rev 0)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm     2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -0,0 +1,133 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "_WKUserContentExtensionStoreInternal.h"
+
+#import "WKContentRuleListStoreInternal.h"
+#import "WKContentRuleListStorePrivate.h"
+#import "WKErrorInternal.h"
+#import "_WKUserContentExtensionStorePrivate.h"
+#import "_WKUserContentFilterInternal.h"
+#import "_WKUserContentFilterPrivate.h"
+#import <string>
+
+NSString * const _WKUserContentExtensionsDomain = @"WKErrorDomain";
+
+static NSError *toUserContentRuleListStoreError(const NSError *error)
+{
+    if (!error)
+        return nil;
+
+    ASSERT(error.domain == WKErrorDomain);
+    switch (error.code) {
+    case WKErrorContentRuleListStoreLookUpFailed:
+        return [NSError errorWithDomain:_WKUserContentExtensionsDomain code:_WKUserContentExtensionStoreErrorLookupFailed userInfo:error.userInfo];
+    case WKErrorContentRuleListStoreVersionMismatch:
+        return [NSError errorWithDomain:_WKUserContentExtensionsDomain code:_WKUserContentExtensionStoreErrorVersionMismatch userInfo:error.userInfo];
+    case WKErrorContentRuleListStoreCompileFailed:
+        return [NSError errorWithDomain:_WKUserContentExtensionsDomain code:_WKUserContentExtensionStoreErrorCompileFailed userInfo:error.userInfo];
+    case WKErrorContentRuleListStoreRemoveFailed:
+        return [NSError errorWithDomain:_WKUserContentExtensionsDomain code:_WKUserContentExtensionStoreErrorRemoveFailed userInfo:error.userInfo];
+    default:
+        RELEASE_ASSERT_NOT_REACHED();
+    }
+}
+
+@implementation _WKUserContentExtensionStore
+
++ (instancetype)defaultStore
+{
+    return adoptNS([[_WKUserContentExtensionStore alloc] _initWithWKContentRuleListStore:[WKContentRuleListStore defaultStoreWithLegacyFilename]]).autorelease();
+}
+
++ (instancetype)storeWithURL:(NSURL *)url
+{
+    return adoptNS([[_WKUserContentExtensionStore alloc] _initWithWKContentRuleListStore:[WKContentRuleListStore storeWithURLAndLegacyFilename:url]]).autorelease();
+}
+
+- (void)compileContentExtensionForIdentifier:(NSString *)identifier encodedContentExtension:(NSString *)encodedContentRuleList completionHandler:(void (^)(_WKUserContentFilter *, NSError *))completionHandler
+{
+    [_contentRuleListStore _compileContentRuleListForIdentifier:identifier encodedContentRuleList:encodedContentRuleList completionHandler:^(WKContentRuleList *contentRuleList, NSError *error) {
+        auto contentFilter = contentRuleList ? adoptNS([[_WKUserContentFilter alloc] _initWithWKContentRuleList:contentRuleList]) : nil;
+        completionHandler(contentFilter.get(), toUserContentRuleListStoreError(error));
+    }];
+}
+
+- (void)lookupContentExtensionForIdentifier:(NSString *)identifier completionHandler:(void (^)(_WKUserContentFilter *, NSError *))completionHandler
+{
+    [_contentRuleListStore lookUpContentRuleListForIdentifier:identifier completionHandler:^(WKContentRuleList *contentRuleList, NSError *error) {
+        auto contentFilter = contentRuleList ? adoptNS([[_WKUserContentFilter alloc] _initWithWKContentRuleList:contentRuleList]) : nil;
+        completionHandler(contentFilter.get(), toUserContentRuleListStoreError(error));
+    }];
+}
+
+- (void)removeContentExtensionForIdentifier:(NSString *)identifier completionHandler:(void (^)(NSError *))completionHandler
+{
+    [_contentRuleListStore removeContentRuleListForIdentifier:identifier completionHandler:^(NSError *error) {
+        completionHandler(toUserContentRuleListStoreError(error));
+    }];
+}
+
+#pragma mark WKObject protocol implementation
+
+- (API::Object&)_apiObject
+{
+    return [_contentRuleListStore _apiObject];
+}
+
+@end
+
+@implementation _WKUserContentExtensionStore (WKPrivate)
+
+// For testing only.
+
+- (void)_removeAllContentExtensions
+{
+    [_contentRuleListStore _removeAllContentRuleLists];
+}
+
+- (void)_invalidateContentExtensionVersionForIdentifier:(NSString *)identifier
+{
+    [_contentRuleListStore _invalidateContentRuleListVersionForIdentifier:identifier];
+}
+
+- (id)_initWithWKContentRuleListStore:(WKContentRuleListStore*)contentRuleListStore
+{
+    self = [super init];
+    if (!self)
+        return nil;
+    
+    _contentRuleListStore = contentRuleListStore;
+    
+    return self;
+}
+
+- (WKContentRuleListStore *)_contentRuleListStore
+{
+    return _contentRuleListStore.get();
+}
+
+@end
</ins></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoa_WKUserContentExtensionStoreInternalhfromrev277604trunkSourceWebKitUIProcessAPICocoa_WKUserContentExtensionStoreInternalh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentExtensionStoreInternal.h (from rev 277604, trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentExtensionStoreInternal.h) (0 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentExtensionStoreInternal.h                           (rev 0)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentExtensionStoreInternal.h      2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "_WKUserContentExtensionStorePrivate.h"
+
+#import "APIContentRuleListStore.h"
+#import "WKObject.h"
+
+@class WKContentRuleListStore;
+
+@interface _WKUserContentExtensionStore () <WKObject> {
+@package
+    RetainPtr<WKContentRuleListStore> _contentRuleListStore;
+}
+@end
</ins></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoa_WKUserContentExtensionStorePrivatehfromrev277604trunkSourceWebKitUIProcessAPICocoa_WKUserContentExtensionStorePrivateh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentExtensionStorePrivate.h (from rev 277604, trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentExtensionStorePrivate.h) (0 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentExtensionStorePrivate.h                            (rev 0)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentExtensionStorePrivate.h       2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit/_WKUserContentExtensionStore.h>
+
+@class WKContentRuleListStore;
+
+@interface _WKUserContentExtensionStore (WKPrivate)
+
+// For testing only.
+- (void)_removeAllContentExtensions;
+- (void)_invalidateContentExtensionVersionForIdentifier:(NSString *)identifier;
+
+- (id)_initWithWKContentRuleListStore:(WKContentRuleListStore *)contentRuleListStore WK_API_AVAILABLE(macos(10.13), ios(11.0));
+@property (nonatomic, readonly) WKContentRuleListStore *_contentRuleListStore WK_API_AVAILABLE(macos(10.15), ios(13.0));
+
+@end
</ins></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoa_WKUserContentFilterhfromrev277604trunkSourceWebKitUIProcessAPICocoa_WKUserContentFilterh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilter.h (from rev 277604, trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilter.h) (0 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilter.h                           (rev 0)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilter.h      2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit/WKFoundation.h>
+
+WK_CLASS_AVAILABLE(macos(10.11), ios(9.0))
+@interface _WKUserContentFilter : NSObject
+
+@end
</ins></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoa_WKUserContentFiltermmfromrev277604trunkSourceWebKitUIProcessAPICocoa_WKUserContentFiltermm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilter.mm (from rev 277604, trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilter.mm) (0 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilter.mm                          (rev 0)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilter.mm     2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "_WKUserContentFilterInternal.h"
+
+#import "WKContentRuleListInternal.h"
+#import "WebCompiledContentRuleList.h"
+#import <WebCore/ContentExtensionCompiler.h>
+#import <WebCore/ContentExtensionError.h>
+#import <string>
+
+@implementation _WKUserContentFilter
+
+#pragma mark WKObject protocol implementation
+
+- (API::Object&)_apiObject
+{
+    return [_contentRuleList _apiObject];
+}
+
+@end
+
+@implementation _WKUserContentFilter (WKPrivate)
+
+- (id)_initWithWKContentRuleList:(WKContentRuleList*)contentRuleList
+{
+    self = [super init];
+    if (!self)
+        return nil;
+    
+    _contentRuleList = contentRuleList;
+    
+    return self;
+}
+
+@end
</ins></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoa_WKUserContentFilterInternalhfromrev277604trunkSourceWebKitUIProcessAPICocoa_WKUserContentFilterInternalh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilterInternal.h (from rev 277604, trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilterInternal.h) (0 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilterInternal.h                           (rev 0)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilterInternal.h      2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit/_WKUserContentFilter.h>
+
+#import "APIContentRuleList.h"
+#import "WKObject.h"
+
+@class WKContentRuleList;
+
+@interface _WKUserContentFilter () <WKObject> {
+@package
+    RetainPtr<WKContentRuleList> _contentRuleList;
+}
+@end
</ins></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoa_WKUserContentFilterPrivatehfromrev277604trunkSourceWebKitUIProcessAPICocoa_WKUserContentFilterPrivateh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilterPrivate.h (from rev 277604, trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilterPrivate.h) (0 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilterPrivate.h                            (rev 0)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentFilterPrivate.h       2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit/_WKUserContentFilter.h>
+
+@class WKUserContentRuleList;
+
+@interface _WKUserContentFilter (WKPrivate)
+
+- (id)_initWithWKContentRuleList:(WKContentRuleList*)contentRuleList WK_API_AVAILABLE(macos(10.13), ios(11.0));
+
+@end
</ins></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaWebURLSchemeHandlerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebURLSchemeHandlerCocoa.mm (277626 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/WebURLSchemeHandlerCocoa.mm  2021-05-18 01:15:29 UTC (rev 277626)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebURLSchemeHandlerCocoa.mm     2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #import "WKURLSchemeHandler.h"
</span><span class="cx"> #import "WKURLSchemeTaskInternal.h"
</span><span class="cx"> #import "WKWebViewInternal.h"
</span><del>-#import "WebPageProxy.h"
</del><span class="cx"> #import "WebURLSchemeTask.h"
</span><span class="cx"> #import <wtf/RunLoop.h>
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.h (277626 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebProcessPool.h   2021-05-18 01:15:29 UTC (rev 277626)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.h      2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -707,6 +707,10 @@
</span><span class="cx">     mutable RetainPtr<NSSet> m_classesForParameterCoder;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if ENABLE(CONTENT_EXTENSIONS)
+    HashMap<String, String> m_encodedContentExtensions;
+#endif
+
</ins><span class="cx"> #if ENABLE(GAMEPAD)
</span><span class="cx">     WeakHashSet<WebProcessProxy> m_processesUsingGamepads;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (277626 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj     2021-05-18 01:15:29 UTC (rev 277626)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj        2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -1290,6 +1290,7 @@
</span><span class="cx">          5CBC9B8E1C652CA000A8FDCF /* NetworkDataTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CBC9B891C6524A500A8FDCF /* NetworkDataTask.h */; };
</span><span class="cx">          5CBD595C2280EDF4002B22AA /* _WKCustomHeaderFields.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C5D2388227A1892000B9BDA /* _WKCustomHeaderFields.mm */; };
</span><span class="cx">          5CD286511E7235990094FDC8 /* WKContentRuleListStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD2864D1E722F440094FDC8 /* WKContentRuleListStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><ins>+               5CD286531E7235AA0094FDC8 /* _WKUserContentFilterPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD286491E722F440094FDC8 /* _WKUserContentFilterPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx">           5CD286541E7235B10094FDC8 /* WKContentRuleList.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD2864A1E722F440094FDC8 /* WKContentRuleList.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><span class="cx">          5CD286551E7235B80094FDC8 /* WKContentRuleListInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD2864C1E722F440094FDC8 /* WKContentRuleListInternal.h */; };
</span><span class="cx">          5CD286571E7235C90094FDC8 /* WKContentRuleListStoreInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CD2864F1E722F440094FDC8 /* WKContentRuleListStoreInternal.h */; };
</span><span class="lines">@@ -1360,6 +1361,8 @@
</span><span class="cx">          7C065F2C1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C065F2A1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.h */; };
</span><span class="cx">          7C135AA9173B0BCA00586AE2 /* WKPluginInformation.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C135AA7173B0BCA00586AE2 /* WKPluginInformation.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          7C1BA33E1A4A0E600043E249 /* APIDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C1BA33C1A4A0E600043E249 /* APIDictionary.h */; };
</span><ins>+               7C2413031AACFA7500A58C15 /* _WKUserContentExtensionStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C2413011AACFA7500A58C15 /* _WKUserContentExtensionStore.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               7C2413051AACFA9C00A58C15 /* _WKUserContentExtensionStoreInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C2413041AACFA9C00A58C15 /* _WKUserContentExtensionStoreInternal.h */; };
</ins><span class="cx">           7C2413091AACFCB400A58C15 /* WKUserContentExtensionStoreRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C2413071AACFCB400A58C15 /* WKUserContentExtensionStoreRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          7C361D731927FA360036A59D /* WebScriptMessageHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C361D701927FA360036A59D /* WebScriptMessageHandler.h */; };
</span><span class="cx">          7C361D78192803BD0036A59D /* WebUserContentControllerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C361D76192803BD0036A59D /* WebUserContentControllerProxyMessageReceiver.cpp */; };
</span><span class="lines">@@ -1381,10 +1384,13 @@
</span><span class="cx">          7C89D2A41A678875003A5FDE /* WKUserScriptRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C89D2A21A678875003A5FDE /* WKUserScriptRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          7C89D2B41A6B068C003A5FDE /* APIContentRuleList.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C89D2B21A6B068C003A5FDE /* APIContentRuleList.h */; };
</span><span class="cx">          7C89D2B61A6B0DD9003A5FDE /* WKUserContentControllerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C89D2B51A6B0DD9003A5FDE /* WKUserContentControllerPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+               7C89D2BA1A6B0F2C003A5FDE /* _WKUserContentFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C89D2B81A6B0F2C003A5FDE /* _WKUserContentFilter.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               7C89D2BC1A6B0F5B003A5FDE /* _WKUserContentFilterInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C89D2BB1A6B0F5B003A5FDE /* _WKUserContentFilterInternal.h */; };
</ins><span class="cx">           7C89D2D71A6C6BE6003A5FDE /* _WKProcessPoolConfigurationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C89D2D61A6C6BE6003A5FDE /* _WKProcessPoolConfigurationInternal.h */; };
</span><span class="cx">          7C8EB11718DB6A19007917C2 /* WKPreferencesPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C8EB11618DB6A19007917C2 /* WKPreferencesPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          7C9D1537184584DA009D3918 /* WKBrowsingContextGroupInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C9D1536184584DA009D3918 /* WKBrowsingContextGroupInternal.h */; };
</span><span class="cx">          7CA254EB182993CE00FC8A41 /* WKBrowsingContextPolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CA254EA182993CE00FC8A41 /* WKBrowsingContextPolicyDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+               7CA3793E1AC378B30079DC37 /* _WKUserContentExtensionStorePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CA3793D1AC378B30079DC37 /* _WKUserContentExtensionStorePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx">           7CB100F11FA3858A001729EE /* WebPreferencesKeys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CB100EE1FA2D74A001729EE /* WebPreferencesKeys.cpp */; };
</span><span class="cx">          7CB100F21FA3858E001729EE /* WebPreferencesDefinitions.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CDE73A31F9DAB6500390312 /* WebPreferencesDefinitions.h */; };
</span><span class="cx">          7CB100F31FA3858E001729EE /* WebPreferencesKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CB100EF1FA2D74B001729EE /* WebPreferencesKeys.h */; };
</span><span class="lines">@@ -4511,6 +4517,7 @@
</span><span class="cx">          5CBC9B891C6524A500A8FDCF /* NetworkDataTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkDataTask.h; sourceTree = "<group>"; };
</span><span class="cx">          5CBC9B8B1C65257300A8FDCF /* NetworkDataTaskCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkDataTaskCocoa.mm; sourceTree = "<group>"; };
</span><span class="cx">          5CC5DB9121488E16006CB8A8 /* SharedBufferCopy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedBufferCopy.h; sourceTree = "<group>"; };
</span><ins>+               5CD286491E722F440094FDC8 /* _WKUserContentFilterPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKUserContentFilterPrivate.h; sourceTree = "<group>"; };
</ins><span class="cx">           5CD2864A1E722F440094FDC8 /* WKContentRuleList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentRuleList.h; sourceTree = "<group>"; };
</span><span class="cx">          5CD2864B1E722F440094FDC8 /* WKContentRuleList.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKContentRuleList.mm; sourceTree = "<group>"; };
</span><span class="cx">          5CD2864C1E722F440094FDC8 /* WKContentRuleListInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentRuleListInternal.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4650,6 +4657,9 @@
</span><span class="cx">          7C135AAA173B0CFF00586AE2 /* PluginInformationMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginInformationMac.mm; sourceTree = "<group>"; };
</span><span class="cx">          7C1BA33B1A4A0E600043E249 /* APIDictionary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIDictionary.cpp; sourceTree = "<group>"; };
</span><span class="cx">          7C1BA33C1A4A0E600043E249 /* APIDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIDictionary.h; sourceTree = "<group>"; };
</span><ins>+               7C2413001AACFA7500A58C15 /* _WKUserContentExtensionStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKUserContentExtensionStore.mm; sourceTree = "<group>"; };
+               7C2413011AACFA7500A58C15 /* _WKUserContentExtensionStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKUserContentExtensionStore.h; sourceTree = "<group>"; };
+               7C2413041AACFA9C00A58C15 /* _WKUserContentExtensionStoreInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKUserContentExtensionStoreInternal.h; sourceTree = "<group>"; };
</ins><span class="cx">           7C2413061AACFCB400A58C15 /* WKUserContentExtensionStoreRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKUserContentExtensionStoreRef.cpp; sourceTree = "<group>"; };
</span><span class="cx">          7C2413071AACFCB400A58C15 /* WKUserContentExtensionStoreRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserContentExtensionStoreRef.h; sourceTree = "<group>"; };
</span><span class="cx">          7C361D6F1927FA360036A59D /* WebScriptMessageHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebScriptMessageHandler.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4693,10 +4703,14 @@
</span><span class="cx">          7C89D2B11A6B068C003A5FDE /* APIContentRuleList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIContentRuleList.cpp; sourceTree = "<group>"; };
</span><span class="cx">          7C89D2B21A6B068C003A5FDE /* APIContentRuleList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIContentRuleList.h; sourceTree = "<group>"; };
</span><span class="cx">          7C89D2B51A6B0DD9003A5FDE /* WKUserContentControllerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserContentControllerPrivate.h; sourceTree = "<group>"; };
</span><ins>+               7C89D2B71A6B0F2C003A5FDE /* _WKUserContentFilter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKUserContentFilter.mm; sourceTree = "<group>"; };
+               7C89D2B81A6B0F2C003A5FDE /* _WKUserContentFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKUserContentFilter.h; sourceTree = "<group>"; };
+               7C89D2BB1A6B0F5B003A5FDE /* _WKUserContentFilterInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKUserContentFilterInternal.h; sourceTree = "<group>"; };
</ins><span class="cx">           7C89D2D61A6C6BE6003A5FDE /* _WKProcessPoolConfigurationInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKProcessPoolConfigurationInternal.h; sourceTree = "<group>"; };
</span><span class="cx">          7C8EB11618DB6A19007917C2 /* WKPreferencesPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferencesPrivate.h; sourceTree = "<group>"; };
</span><span class="cx">          7C9D1536184584DA009D3918 /* WKBrowsingContextGroupInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBrowsingContextGroupInternal.h; sourceTree = "<group>"; };
</span><span class="cx">          7CA254EA182993CE00FC8A41 /* WKBrowsingContextPolicyDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBrowsingContextPolicyDelegate.h; sourceTree = "<group>"; };
</span><ins>+               7CA3793D1AC378B30079DC37 /* _WKUserContentExtensionStorePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKUserContentExtensionStorePrivate.h; sourceTree = "<group>"; };
</ins><span class="cx">           7CB100EE1FA2D74A001729EE /* WebPreferencesKeys.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WebPreferencesKeys.cpp; path = DerivedSources/WebKit2/WebPreferencesKeys.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx">          7CB100EF1FA2D74B001729EE /* WebPreferencesKeys.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WebPreferencesKeys.h; path = DerivedSources/WebKit2/WebPreferencesKeys.h; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx">          7CB100F01FA2D784001729EE /* WebPreferencesStoreDefaultsMap.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WebPreferencesStoreDefaultsMap.cpp; path = DerivedSources/WebKit2/WebPreferencesStoreDefaultsMap.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="lines">@@ -8036,6 +8050,14 @@
</span><span class="cx">                          2D6B371918A967AD0042AE80 /* _WKThumbnailView.h */,
</span><span class="cx">                          2D6B371A18A967AD0042AE80 /* _WKThumbnailView.mm */,
</span><span class="cx">                          2DACE64D18ADBFF000E4CA76 /* _WKThumbnailViewInternal.h */,
</span><ins>+                               7C2413011AACFA7500A58C15 /* _WKUserContentExtensionStore.h */,
+                               7C2413001AACFA7500A58C15 /* _WKUserContentExtensionStore.mm */,
+                               7C2413041AACFA9C00A58C15 /* _WKUserContentExtensionStoreInternal.h */,
+                               7CA3793D1AC378B30079DC37 /* _WKUserContentExtensionStorePrivate.h */,
+                               7C89D2B81A6B0F2C003A5FDE /* _WKUserContentFilter.h */,
+                               7C89D2B71A6B0F2C003A5FDE /* _WKUserContentFilter.mm */,
+                               7C89D2BB1A6B0F5B003A5FDE /* _WKUserContentFilterInternal.h */,
+                               5CD286491E722F440094FDC8 /* _WKUserContentFilterPrivate.h */,
</ins><span class="cx">                           7C882DF31C7E995E006BF731 /* _WKUserContentWorld.h */,
</span><span class="cx">                          7C882DF41C7E995E006BF731 /* _WKUserContentWorld.mm */,
</span><span class="cx">                          7C882DF51C7E995E006BF731 /* _WKUserContentWorldInternal.h */,
</span><span class="lines">@@ -11687,6 +11709,12 @@
</span><span class="cx">                          2D6B371B18A967AD0042AE80 /* _WKThumbnailView.h in Headers */,
</span><span class="cx">                          2DACE64E18ADBFF000E4CA76 /* _WKThumbnailViewInternal.h in Headers */,
</span><span class="cx">                          99E7189C21F79D9E0055E975 /* _WKTouchEventGenerator.h in Headers */,
</span><ins>+                               7C2413031AACFA7500A58C15 /* _WKUserContentExtensionStore.h in Headers */,
+                               7C2413051AACFA9C00A58C15 /* _WKUserContentExtensionStoreInternal.h in Headers */,
+                               7CA3793E1AC378B30079DC37 /* _WKUserContentExtensionStorePrivate.h in Headers */,
+                               7C89D2BA1A6B0F2C003A5FDE /* _WKUserContentFilter.h in Headers */,
+                               7C89D2BC1A6B0F5B003A5FDE /* _WKUserContentFilterInternal.h in Headers */,
+                               5CD286531E7235AA0094FDC8 /* _WKUserContentFilterPrivate.h in Headers */,
</ins><span class="cx">                           7C882DF71C7E9965006BF731 /* _WKUserContentWorld.h in Headers */,
</span><span class="cx">                          7C882DF91C7E996F006BF731 /* _WKUserContentWorldInternal.h in Headers */,
</span><span class="cx">                          7CB365AA1D31DB70007158CA /* _WKUserInitiatedAction.h in Headers */,
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (277626 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-05-18 01:15:29 UTC (rev 277626)
+++ trunk/Tools/ChangeLog       2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2021-05-17  Alex Christensen  <achristensen@webkit.org>
+
+        Unreviewed, reverting r277605.
+
+        Broke iOS tests
+
+        Reverted changeset:
+
+        "Remove _WKUserContentFilter and _WKUserContentExtensionStore"
+        https://bugs.webkit.org/show_bug.cgi?id=224391
+        https://commits.webkit.org/r277605
+
</ins><span class="cx"> 2021-05-17  Jonathan Bedard  <jbedard@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [webkitscmpy] Support testing on machines without svn installed
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacAppDelegatem"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.m (277626 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/AppDelegate.m        2021-05-18 01:15:29 UTC (rev 277626)
+++ trunk/Tools/MiniBrowser/mac/AppDelegate.m   2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #import <WebKit/_WKExperimentalFeature.h>
</span><span class="cx"> #import <WebKit/_WKInternalDebugFeature.h>
</span><span class="cx"> #import <WebKit/_WKProcessPoolConfiguration.h>
</span><ins>+#import <WebKit/_WKUserContentExtensionStore.h>
</ins><span class="cx"> #import <WebKit/_WKWebsiteDataStoreConfiguration.h>
</span><span class="cx"> 
</span><span class="cx"> enum {
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacExtensionManagerWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/ExtensionManagerWindowController.m (277626 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/ExtensionManagerWindowController.m   2021-05-18 01:15:29 UTC (rev 277626)
+++ trunk/Tools/MiniBrowser/mac/ExtensionManagerWindowController.m      2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> 
</span><span class="cx"> #import "AppDelegate.h"
</span><span class="cx"> #import <WebKit/WKUserContentControllerPrivate.h>
</span><ins>+#import <WebKit/_WKUserContentExtensionStore.h>
</ins><span class="cx"> 
</span><span class="cx"> @implementation ExtensionManagerWindowController
</span><span class="cx"> 
</span><span class="lines">@@ -37,7 +38,7 @@
</span><span class="cx">         NSArray* installedContentExtensions = [[NSUserDefaults standardUserDefaults] arrayForKey:@"InstalledContentExtensions"];
</span><span class="cx">         if (installedContentExtensions) {
</span><span class="cx">             for (NSString *identifier in installedContentExtensions) {
</span><del>-                [[WKContentRuleListStore defaultStore] lookUpContentRuleListForIdentifier:identifier completionHandler:^(WKContentRuleList *list, NSError *error)
</del><ins>+                [[_WKUserContentExtensionStore defaultStore] lookupContentExtensionForIdentifier:identifier completionHandler:^(_WKUserContentFilter *extension, NSError *error)
</ins><span class="cx">                 {
</span><span class="cx">                     if (error) {
</span><span class="cx">                         NSLog(@"Extension store got out of sync with system defaults.");
</span><span class="lines">@@ -45,7 +46,7 @@
</span><span class="cx">                     }
</span><span class="cx"> 
</span><span class="cx">                     BrowserAppDelegate* appDelegate = [[NSApplication sharedApplication] browserAppDelegate];
</span><del>-                    [appDelegate.userContentContoller addContentRuleList:list];
</del><ins>+                    [appDelegate.userContentContoller _addUserContentFilter:extension];
</ins><span class="cx">                 }];
</span><span class="cx">             }
</span><span class="cx">                 
</span><span class="lines">@@ -82,7 +83,7 @@
</span><span class="cx">         NSString *identifier = url.lastPathComponent;
</span><span class="cx">         NSString *jsonString = [[NSString alloc] initWithContentsOfURL:url encoding:NSUTF8StringEncoding error:nil];
</span><span class="cx"> 
</span><del>-        [[WKContentRuleListStore defaultStore] compileContentRuleListForIdentifier:identifier encodedContentRuleList:jsonString completionHandler:^(WKContentRuleList *list, NSError *error)
</del><ins>+        [[_WKUserContentExtensionStore defaultStore] compileContentExtensionForIdentifier:identifier encodedContentExtension:jsonString completionHandler:^(_WKUserContentFilter *extension, NSError *error)
</ins><span class="cx">         {
</span><span class="cx">             
</span><span class="cx">             if (error) {
</span><span class="lines">@@ -107,7 +108,7 @@
</span><span class="cx">             [arrayController addObject:identifier];
</span><span class="cx"> 
</span><span class="cx">             BrowserAppDelegate* appDelegate = [[NSApplication sharedApplication] browserAppDelegate];
</span><del>-            [appDelegate.userContentContoller addContentRuleList:list];
</del><ins>+            [appDelegate.userContentContoller _addUserContentFilter:extension];
</ins><span class="cx">         }];
</span><span class="cx">     }];
</span><span class="cx"> 
</span><span class="lines">@@ -119,7 +120,7 @@
</span><span class="cx"> 
</span><span class="cx">     NSString *identifierToRemove = arrayController.arrangedObjects[index];
</span><span class="cx"> 
</span><del>-    [[WKContentRuleListStore defaultStore] removeContentRuleListForIdentifier:identifierToRemove completionHandler:^(NSError *error)
</del><ins>+    [[_WKUserContentExtensionStore defaultStore] removeContentExtensionForIdentifier:identifierToRemove completionHandler:^(NSError *error)
</ins><span class="cx">     {
</span><span class="cx">         if (error) {
</span><span class="cx">             NSAlert *alert = [NSAlert alertWithError:error];
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (277626 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj        2021-05-18 01:15:29 UTC (rev 277626)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj   2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -806,6 +806,7 @@
</span><span class="cx">          7CD4C26E1E2C0E6E00929470 /* StringConcatenate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CD4C26C1E2C0E6E00929470 /* StringConcatenate.cpp */; };
</span><span class="cx">          7CD70C4F24A436EE00E61040 /* StringParsingBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CD70C4E24A436EE00E61040 /* StringParsingBuffer.cpp */; };
</span><span class="cx">          7CEB62AB223609DE0069CBB0 /* IteratorRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CEB62A92236086C0069CBB0 /* IteratorRange.cpp */; };
</span><ins>+               7CEFA9661AC0B9E200B910FD /* _WKUserContentExtensionStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CEFA9641AC0B9E200B910FD /* _WKUserContentExtensionStore.mm */; };
</ins><span class="cx">           7CFBCAE51743238F00B2BFCF /* WillLoad_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CFBCAE31743238E00B2BFCF /* WillLoad_Bundle.cpp */; };
</span><span class="cx">          830F2E0C209A6A8E00D36FF1 /* WebContentProcessDidTerminate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 830F2E0B209A6A7400D36FF1 /* WebContentProcessDidTerminate.mm */; };
</span><span class="cx">          83148B06202AC6A400BADE99 /* InjectedBundleDisableOverrideBuiltinsBehavior.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83148B05202AC68200BADE99 /* InjectedBundleDisableOverrideBuiltinsBehavior.cpp */; };
</span><span class="lines">@@ -2482,6 +2483,7 @@
</span><span class="cx">          7CD4C26C1E2C0E6E00929470 /* StringConcatenate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringConcatenate.cpp; sourceTree = "<group>"; };
</span><span class="cx">          7CD70C4E24A436EE00E61040 /* StringParsingBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StringParsingBuffer.cpp; sourceTree = "<group>"; };
</span><span class="cx">          7CEB62A92236086C0069CBB0 /* IteratorRange.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = IteratorRange.cpp; sourceTree = "<group>"; };
</span><ins>+               7CEFA9641AC0B9E200B910FD /* _WKUserContentExtensionStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKUserContentExtensionStore.mm; sourceTree = "<group>"; };
</ins><span class="cx">           7CFBCADD1743234F00B2BFCF /* WillLoad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WillLoad.cpp; sourceTree = "<group>"; };
</span><span class="cx">          7CFBCAE31743238E00B2BFCF /* WillLoad_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WillLoad_Bundle.cpp; sourceTree = "<group>"; };
</span><span class="cx">          81B50192140F232300D9EB58 /* StringBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringBuilder.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -3340,6 +3342,7 @@
</span><span class="cx">                  children = (
</span><span class="cx">                          A16F66B81C40E9E100BD4D24 /* Resources */,
</span><span class="cx">                          5CEAB5DF1FA937CB00A77FAA /* _WKInputDelegate.mm */,
</span><ins>+                               7CEFA9641AC0B9E200B910FD /* _WKUserContentExtensionStore.mm */,
</ins><span class="cx">                           57C6244D2346BCFA00383FE7 /* _WKWebAuthenticationPanel.mm */,
</span><span class="cx">                          0746645822FF630500E3451A /* AccessibilityTestPlugin.mm */,
</span><span class="cx">                          0746645722FF62D000E3451A /* AccessibilityTestSupportProtocol.h */,
</span><span class="lines">@@ -5266,6 +5269,7 @@
</span><span class="cx">                  buildActionMask = 2147483647;
</span><span class="cx">                  files = (
</span><span class="cx">                          5CEAB5E11FA939F400A77FAA /* _WKInputDelegate.mm in Sources */,
</span><ins>+                               7CEFA9661AC0B9E200B910FD /* _WKUserContentExtensionStore.mm in Sources */,
</ins><span class="cx">                           57C6244E2346BCFA00383FE7 /* _WKWebAuthenticationPanel.mm in Sources */,
</span><span class="cx">                          7CCE7EE41A411AE600447C4C /* AboutBlankLoad.cpp in Sources */,
</span><span class="cx">                          7CCE7EB31A411A7E00447C4C /* AcceptsFirstMouse.mm in Sources */,
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaWebsitePoliciesmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsitePolicies.mm (277626 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsitePolicies.mm   2021-05-18 01:15:29 UTC (rev 277626)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsitePolicies.mm      2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #import "TestNavigationDelegate.h"
</span><span class="cx"> #import "TestUIDelegate.h"
</span><span class="cx"> #import "TestWKWebView.h"
</span><del>-#import <WebKit/WKContentRuleListStorePrivate.h>
</del><span class="cx"> #import <WebKit/WKMutableDictionary.h>
</span><span class="cx"> #import <WebKit/WKNavigationDelegatePrivate.h>
</span><span class="cx"> #import <WebKit/WKPagePrivate.h>
</span><span class="lines">@@ -44,6 +43,7 @@
</span><span class="cx"> #import <WebKit/WKWebsiteDataStorePrivate.h>
</span><span class="cx"> #import <WebKit/WKWebsitePolicies.h>
</span><span class="cx"> #import <WebKit/_WKCustomHeaderFields.h>
</span><ins>+#import <WebKit/_WKUserContentExtensionStorePrivate.h>
</ins><span class="cx"> #import <WebKit/_WKWebsiteDataStoreConfiguration.h>
</span><span class="cx"> #import <wtf/Function.h>
</span><span class="cx"> #import <wtf/HashMap.h>
</span><span class="lines">@@ -137,15 +137,15 @@
</span><span class="cx"> 
</span><span class="cx"> TEST(WebpagePreferences, WebsitePoliciesContentBlockersEnabled)
</span><span class="cx"> {
</span><del>-    [[WKContentRuleListStore defaultStore] _removeAllContentRuleLists];
</del><ins>+    [[_WKUserContentExtensionStore defaultStore] _removeAllContentExtensions];
</ins><span class="cx"> 
</span><span class="cx">     auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
</span><span class="cx"> 
</span><span class="cx">     doneCompiling = false;
</span><span class="cx">     NSString* contentBlocker = @"[{\"action\":{\"type\":\"css-display-none\",\"selector\":\".hidden\"},\"trigger\":{\"url-filter\":\".*\"}}]";
</span><del>-    [[WKContentRuleListStore defaultStore] compileContentRuleListForIdentifier:@"WebsitePoliciesTest" encodedContentRuleList:contentBlocker completionHandler:^(WKContentRuleList *list, NSError *error) {
</del><ins>+    [[_WKUserContentExtensionStore defaultStore] compileContentExtensionForIdentifier:@"WebsitePoliciesTest" encodedContentExtension:contentBlocker completionHandler:^(_WKUserContentFilter *filter, NSError *error) {
</ins><span class="cx">         EXPECT_TRUE(error == nil);
</span><del>-        [[configuration userContentController] addContentRuleList:list];
</del><ins>+        [[configuration userContentController] _addUserContentFilter:filter];
</ins><span class="cx">         doneCompiling = true;
</span><span class="cx">     }];
</span><span class="cx">     TestWebKitAPI::Util::run(&doneCompiling);
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx">     [webView _reloadWithoutContentBlockers];
</span><span class="cx">     TestWebKitAPI::Util::run(&receivedAlert);
</span><span class="cx"> 
</span><del>-    [[WKContentRuleListStore defaultStore] _removeAllContentRuleLists];
</del><ins>+    [[_WKUserContentExtensionStore defaultStore] _removeAllContentExtensions];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> @interface AutoplayPoliciesDelegate : TestNavigationDelegate <WKNavigationDelegate, WKUIDelegatePrivate>
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoa_WKUserContentExtensionStoremmfromrev277604trunkToolsTestWebKitAPITestsWebKitCocoa_WKUserContentExtensionStoremm"></a>
<div class="copfile"><h4>Copied: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/_WKUserContentExtensionStore.mm (from rev 277604, trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/_WKUserContentExtensionStore.mm) (0 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/_WKUserContentExtensionStore.mm                              (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/_WKUserContentExtensionStore.mm 2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -0,0 +1,182 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import <WebKit/WKFoundation.h>
+
+#import "PlatformUtilities.h"
+#import "Test.h"
+#import <WebKit/_WKUserContentExtensionStorePrivate.h>
+#import <wtf/RetainPtr.h>
+
+class _WKUserContentExtensionStoreTest : public testing::Test {
+public:
+    virtual void SetUp()
+    {
+        [[_WKUserContentExtensionStore defaultStore] _removeAllContentExtensions];
+    }
+};
+
+static NSString *basicFilter = @"[{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\".*webkit.org\"}}]";
+
+TEST_F(_WKUserContentExtensionStoreTest, Compile)
+{
+    __block bool doneCompiling = false;
+    [[_WKUserContentExtensionStore defaultStore] compileContentExtensionForIdentifier:@"TestExtension" encodedContentExtension:basicFilter completionHandler:^(_WKUserContentFilter *filter, NSError *error) {
+    
+        EXPECT_NOT_NULL(filter);
+        EXPECT_NULL(error);
+
+        doneCompiling = true;
+    }];
+    TestWebKitAPI::Util::run(&doneCompiling);
+}
+
+static NSString *invalidFilter = @"[";
+
+static void checkDomain(NSError *error)
+{
+    EXPECT_STREQ([[error domain] UTF8String], [_WKUserContentExtensionsDomain UTF8String]);
+}
+
+TEST_F(_WKUserContentExtensionStoreTest, InvalidExtension)
+{
+    __block bool doneCompiling = false;
+    [[_WKUserContentExtensionStore defaultStore] compileContentExtensionForIdentifier:@"TestExtension" encodedContentExtension:invalidFilter completionHandler:^(_WKUserContentFilter *filter, NSError *error) {
+    
+        EXPECT_NULL(filter);
+        EXPECT_NOT_NULL(error);
+        checkDomain(error);
+        EXPECT_EQ(error.code, _WKUserContentExtensionStoreErrorCompileFailed);
+        EXPECT_STREQ("Rule list compilation failed: Failed to parse the JSON String.", [[error helpAnchor] UTF8String]);
+
+        doneCompiling = true;
+    }];
+    TestWebKitAPI::Util::run(&doneCompiling);
+}
+
+TEST_F(_WKUserContentExtensionStoreTest, Lookup)
+{
+    __block bool doneCompiling = false;
+    [[_WKUserContentExtensionStore defaultStore] compileContentExtensionForIdentifier:@"TestExtension" encodedContentExtension:basicFilter completionHandler:^(_WKUserContentFilter *filter, NSError *error) {
+    
+        EXPECT_NOT_NULL(filter);
+        EXPECT_NULL(error);
+
+        doneCompiling = true;
+    }];
+    TestWebKitAPI::Util::run(&doneCompiling);
+
+    __block bool doneLookingUp = false;
+    [[_WKUserContentExtensionStore defaultStore] lookupContentExtensionForIdentifier:@"TestExtension" completionHandler:^(_WKUserContentFilter *filter, NSError *error) {
+    
+        EXPECT_NOT_NULL(filter);
+        EXPECT_NULL(error);
+
+        doneLookingUp = true;
+    }];
+    TestWebKitAPI::Util::run(&doneLookingUp);
+}
+
+TEST_F(_WKUserContentExtensionStoreTest, NonExistingIdentifierLookup)
+{
+    __block bool doneLookingUp = false;
+    [[_WKUserContentExtensionStore defaultStore] lookupContentExtensionForIdentifier:@"DoesNotExist" completionHandler:^(_WKUserContentFilter *filter, NSError *error) {
+    
+        EXPECT_NULL(filter);
+        EXPECT_NOT_NULL(error);
+        checkDomain(error);
+        EXPECT_EQ(error.code, _WKUserContentExtensionStoreErrorLookupFailed);
+        EXPECT_STREQ("Rule list lookup failed: Unspecified error during lookup.", [[error helpAnchor] UTF8String]);
+        
+        doneLookingUp = true;
+    }];
+    TestWebKitAPI::Util::run(&doneLookingUp);
+}
+
+TEST_F(_WKUserContentExtensionStoreTest, VersionMismatch)
+{
+    __block bool doneCompiling = false;
+    [[_WKUserContentExtensionStore defaultStore] compileContentExtensionForIdentifier:@"TestExtension" encodedContentExtension:basicFilter completionHandler:^(_WKUserContentFilter *filter, NSError *error)
+    {
+        
+        EXPECT_NOT_NULL(filter);
+        EXPECT_NULL(error);
+        
+        doneCompiling = true;
+    }];
+    TestWebKitAPI::Util::run(&doneCompiling);
+
+    [[_WKUserContentExtensionStore defaultStore] _invalidateContentExtensionVersionForIdentifier:@"TestExtension"];
+    
+    __block bool doneLookingUp = false;
+    [[_WKUserContentExtensionStore defaultStore] lookupContentExtensionForIdentifier:@"TestExtension" completionHandler:^(_WKUserContentFilter *filter, NSError *error)
+    {
+        
+        EXPECT_NULL(filter);
+        EXPECT_NOT_NULL(error);
+        checkDomain(error);
+        EXPECT_EQ(error.code, _WKUserContentExtensionStoreErrorVersionMismatch);
+        EXPECT_STREQ("Rule list lookup failed: Version of file does not match version of interpreter.", [[error helpAnchor] UTF8String]);
+        
+        doneLookingUp = true;
+    }];
+    TestWebKitAPI::Util::run(&doneLookingUp);
+}
+
+TEST_F(_WKUserContentExtensionStoreTest, Removal)
+{
+    __block bool doneCompiling = false;
+    [[_WKUserContentExtensionStore defaultStore] compileContentExtensionForIdentifier:@"TestExtension" encodedContentExtension:basicFilter completionHandler:^(_WKUserContentFilter *filter, NSError *error) {
+    
+        EXPECT_NOT_NULL(filter);
+        EXPECT_NULL(error);
+
+        doneCompiling = true;
+    }];
+    TestWebKitAPI::Util::run(&doneCompiling);
+
+    __block bool doneRemoving = false;
+    [[_WKUserContentExtensionStore defaultStore] removeContentExtensionForIdentifier:@"TestExtension" completionHandler:^(NSError *error) {
+        EXPECT_NULL(error);
+
+        doneRemoving = true;
+    }];
+    TestWebKitAPI::Util::run(&doneRemoving);
+}
+
+TEST_F(_WKUserContentExtensionStoreTest, NonExistingIdentifierRemove)
+{
+    __block bool doneRemoving = false;
+    [[_WKUserContentExtensionStore defaultStore] removeContentExtensionForIdentifier:@"DoesNotExist" completionHandler:^(NSError *error) {
+        EXPECT_NOT_NULL(error);
+        checkDomain(error);
+        EXPECT_EQ(error.code, _WKUserContentExtensionStoreErrorRemoveFailed);
+        EXPECT_STREQ("Rule list removal failed: Unspecified error during remove.", [[error helpAnchor] UTF8String]);
+
+        doneRemoving = true;
+    }];
+    TestWebKitAPI::Util::run(&doneRemoving);
+}
</ins></span></pre></div>
<a id="trunkToolsWebKitTestRunnercocoaTestControllerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm (277626 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm        2021-05-18 01:15:29 UTC (rev 277626)
+++ trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm   2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #import "WebCoreTestSupport.h"
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> #import <Security/SecItem.h>
</span><del>-#import <WebKit/WKContentRuleListStorePrivate.h>
</del><span class="cx"> #import <WebKit/WKContextConfigurationRef.h>
</span><span class="cx"> #import <WebKit/WKContextPrivate.h>
</span><span class="cx"> #import <WebKit/WKPreferencesRefPrivate.h>
</span><span class="lines">@@ -51,6 +50,8 @@
</span><span class="cx"> #import <WebKit/WKWebsiteDataStorePrivate.h>
</span><span class="cx"> #import <WebKit/WKWebsiteDataStoreRef.h>
</span><span class="cx"> #import <WebKit/_WKApplicationManifest.h>
</span><ins>+#import <WebKit/_WKUserContentExtensionStore.h>
+#import <WebKit/_WKUserContentExtensionStorePrivate.h>
</ins><span class="cx"> #import <WebKit/_WKWebsiteDataStoreConfiguration.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><span class="cx"> #import <wtf/cocoa/VectorCocoa.h>
</span><span class="lines">@@ -262,16 +263,15 @@
</span><span class="cx"> void TestController::resetContentExtensions()
</span><span class="cx"> {
</span><span class="cx">     __block bool doneRemoving = false;
</span><del>-    // FIXME: This does not match the store used in TestController::configureContentExtensionForTest. It probably should.
-    [[WKContentRuleListStore defaultStore] removeContentRuleListForIdentifier:@"TestContentExtensions" completionHandler:^(NSError *error) {
</del><ins>+    [[_WKUserContentExtensionStore defaultStore] removeContentExtensionForIdentifier:@"TestContentExtensions" completionHandler:^(NSError *error) {
</ins><span class="cx">         doneRemoving = true;
</span><span class="cx">     }];
</span><span class="cx">     platformRunUntil(doneRemoving, noTimeout);
</span><del>-    [[WKContentRuleListStore defaultStore] _removeAllContentRuleLists];
</del><ins>+    [[_WKUserContentExtensionStore defaultStore] _removeAllContentExtensions];
</ins><span class="cx"> 
</span><span class="cx">     if (auto* webView = mainWebView()) {
</span><span class="cx">         TestRunnerWKWebView *platformView = webView->platformView();
</span><del>-        [platformView.configuration.userContentController removeAllContentRuleLists];
</del><ins>+        [platformView.configuration.userContentController _removeAllUserContentFilters];
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnermacTestControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm (277626 => 277627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm    2021-05-18 01:15:29 UTC (rev 277626)
+++ trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm       2021-05-18 01:33:52 UTC (rev 277627)
</span><span class="lines">@@ -42,6 +42,8 @@
</span><span class="cx"> #import <WebKit/WKWebViewConfiguration.h>
</span><span class="cx"> #import <WebKit/WKWebViewConfigurationPrivate.h>
</span><span class="cx"> #import <WebKit/WKWebViewPrivate.h>
</span><ins>+#import <WebKit/_WKUserContentExtensionStore.h>
+#import <WebKit/_WKUserContentExtensionStorePrivate.h>
</ins><span class="cx"> #import <mach-o/dyld.h>
</span><span class="cx"> 
</span><span class="cx"> @interface NSSound ()
</span><span class="lines">@@ -204,10 +206,10 @@
</span><span class="cx">     } else
</span><span class="cx">         tempDir = [NSURL fileURLWithPath:[NSTemporaryDirectory() stringByAppendingPathComponent:@"ContentExtensions"] isDirectory:YES];
</span><span class="cx"> 
</span><del>-    [[WKContentRuleListStore storeWithURL:tempDir] compileContentRuleListForIdentifier:@"TestContentExtensions" encodedContentRuleList:contentExtensionString.get() completionHandler:^(WKContentRuleList *list, NSError *error)
</del><ins>+    [[_WKUserContentExtensionStore storeWithURL:tempDir] compileContentExtensionForIdentifier:@"TestContentExtensions" encodedContentExtension:contentExtensionString.get() completionHandler:^(_WKUserContentFilter *filter, NSError *error)
</ins><span class="cx">     {
</span><span class="cx">         if (!error)
</span><del>-            [mainWebView()->platformView().configuration.userContentController addContentRuleList:list];
</del><ins>+            [mainWebView()->platformView().configuration.userContentController _addUserContentFilter:filter];
</ins><span class="cx">         else
</span><span class="cx">             NSLog(@"%@", [error helpAnchor]);
</span><span class="cx">         doneCompiling = true;
</span></span></pre>
</div>
</div>

</body>
</html>