Title: [265081] trunk
Revision
265081
Author
[email protected]
Date
2020-07-30 08:10:39 -0700 (Thu, 30 Jul 2020)

Log Message

Remove non-inclusive terminology from WebKit variable names and test-only SPI
https://bugs.webkit.org/show_bug.cgi?id=214941

Patch by Alex Christensen <[email protected]> on 2020-07-30
Reviewed by Michael Catanzaro.

Source/WebKit:

* NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::addOriginAccessAllowListEntry):
(WebKit::NetworkConnectionToWebProcess::removeOriginAccessAllowListEntry):
(WebKit::NetworkConnectionToWebProcess::resetOriginAccessAllowLists):
(WebKit::NetworkConnectionToWebProcess::addOriginAccessWhitelistEntry): Deleted.
(WebKit::NetworkConnectionToWebProcess::removeOriginAccessWhitelistEntry): Deleted.
(WebKit::NetworkConnectionToWebProcess::resetOriginAccessWhitelists): Deleted.
* NetworkProcess/NetworkConnectionToWebProcess.h:
* NetworkProcess/NetworkConnectionToWebProcess.messages.in:
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::encode const):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* UIProcess/API/glib/WebKitUserContent.cpp:
(_WebKitUserStyleSheet::_WebKitUserStyleSheet):
(webkit_user_style_sheet_new):
(webkit_user_style_sheet_new_for_world):
(_WebKitUserScript::_WebKitUserScript):
(webkit_user_script_new):
(webkit_user_script_new_for_world):
* UIProcess/API/glib/WebKitWebContext.cpp:
(pathIsBlocked):
(webkit_web_context_add_path_to_sandbox):
(pathIsBlacklisted): Deleted.
* UIProcess/API/gtk/WebKitUserContent.h:
* UIProcess/API/wpe/WebKitUserContent.h:
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformInitializeWebProcess):
* UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
(WebKit::setupSeccomp):
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::setFontAllowList):
* UIProcess/WebProcessPool.h:
* WebProcess/InjectedBundle/API/c/WKBundle.cpp:
(WKBundleAddOriginAccessAllowListEntry):
(WKBundleRemoveOriginAccessAllowListEntry):
(WKBundleResetOriginAccessAllowLists):
(WKBundleAddOriginAccessWhitelistEntry): Deleted.
(WKBundleRemoveOriginAccessWhitelistEntry): Deleted.
(WKBundleResetOriginAccessWhitelists): Deleted.
* WebProcess/InjectedBundle/API/c/WKBundlePrivate.h:
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::addOriginAccessAllowListEntry):
(WebKit::InjectedBundle::removeOriginAccessAllowListEntry):
(WebKit::InjectedBundle::resetOriginAccessAllowLists):
(WebKit::InjectedBundle::addOriginAccessWhitelistEntry): Deleted.
(WebKit::InjectedBundle::removeOriginAccessWhitelistEntry): Deleted.
(WebKit::InjectedBundle::resetOriginAccessWhitelists): Deleted.
* WebProcess/InjectedBundle/InjectedBundle.h:
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):

Tools:

* WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
(WTR::InjectedBundle::beginTesting):
* WebKitTestRunner/InjectedBundle/TestRunner.cpp:
(WTR::TestRunner::addOriginAccessWhitelistEntry):
(WTR::TestRunner::removeOriginAccessWhitelistEntry):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (265080 => 265081)


--- trunk/Source/WebKit/ChangeLog	2020-07-30 08:53:28 UTC (rev 265080)
+++ trunk/Source/WebKit/ChangeLog	2020-07-30 15:10:39 UTC (rev 265081)
@@ -1,3 +1,62 @@
+2020-07-30  Alex Christensen  <[email protected]>
+
+        Remove non-inclusive terminology from WebKit variable names and test-only SPI
+        https://bugs.webkit.org/show_bug.cgi?id=214941
+
+        Reviewed by Michael Catanzaro.
+
+        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+        (WebKit::NetworkConnectionToWebProcess::addOriginAccessAllowListEntry):
+        (WebKit::NetworkConnectionToWebProcess::removeOriginAccessAllowListEntry):
+        (WebKit::NetworkConnectionToWebProcess::resetOriginAccessAllowLists):
+        (WebKit::NetworkConnectionToWebProcess::addOriginAccessWhitelistEntry): Deleted.
+        (WebKit::NetworkConnectionToWebProcess::removeOriginAccessWhitelistEntry): Deleted.
+        (WebKit::NetworkConnectionToWebProcess::resetOriginAccessWhitelists): Deleted.
+        * NetworkProcess/NetworkConnectionToWebProcess.h:
+        * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode const):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+        * UIProcess/API/glib/WebKitUserContent.cpp:
+        (_WebKitUserStyleSheet::_WebKitUserStyleSheet):
+        (webkit_user_style_sheet_new):
+        (webkit_user_style_sheet_new_for_world):
+        (_WebKitUserScript::_WebKitUserScript):
+        (webkit_user_script_new):
+        (webkit_user_script_new_for_world):
+        * UIProcess/API/glib/WebKitWebContext.cpp:
+        (pathIsBlocked):
+        (webkit_web_context_add_path_to_sandbox):
+        (pathIsBlacklisted): Deleted.
+        * UIProcess/API/gtk/WebKitUserContent.h:
+        * UIProcess/API/wpe/WebKitUserContent.h:
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::WebProcessPool::platformInitializeWebProcess):
+        * UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
+        (WebKit::setupSeccomp):
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::setFontAllowList):
+        * UIProcess/WebProcessPool.h:
+        * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
+        (WKBundleAddOriginAccessAllowListEntry):
+        (WKBundleRemoveOriginAccessAllowListEntry):
+        (WKBundleResetOriginAccessAllowLists):
+        (WKBundleAddOriginAccessWhitelistEntry): Deleted.
+        (WKBundleRemoveOriginAccessWhitelistEntry): Deleted.
+        (WKBundleResetOriginAccessWhitelists): Deleted.
+        * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h:
+        * WebProcess/InjectedBundle/InjectedBundle.cpp:
+        (WebKit::InjectedBundle::addOriginAccessAllowListEntry):
+        (WebKit::InjectedBundle::removeOriginAccessAllowListEntry):
+        (WebKit::InjectedBundle::resetOriginAccessAllowLists):
+        (WebKit::InjectedBundle::addOriginAccessWhitelistEntry): Deleted.
+        (WebKit::InjectedBundle::removeOriginAccessWhitelistEntry): Deleted.
+        (WebKit::InjectedBundle::resetOriginAccessWhitelists): Deleted.
+        * WebProcess/InjectedBundle/InjectedBundle.h:
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+
 2020-07-15  Carlos Garcia Campos  <[email protected]>
 
         [GTK4] Enable API tests

Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (265080 => 265081)


--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp	2020-07-30 08:53:28 UTC (rev 265080)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp	2020-07-30 15:10:39 UTC (rev 265081)
@@ -916,17 +916,17 @@
 }
 #endif
 
-void NetworkConnectionToWebProcess::addOriginAccessWhitelistEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains)
+void NetworkConnectionToWebProcess::addOriginAccessAllowListEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains)
 {
     SecurityPolicy::addOriginAccessAllowlistEntry(SecurityOrigin::createFromString(sourceOrigin).get(), destinationProtocol, destinationHost, allowDestinationSubdomains);
 }
 
-void NetworkConnectionToWebProcess::removeOriginAccessWhitelistEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains)
+void NetworkConnectionToWebProcess::removeOriginAccessAllowListEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains)
 {
     SecurityPolicy::removeOriginAccessAllowlistEntry(SecurityOrigin::createFromString(sourceOrigin).get(), destinationProtocol, destinationHost, allowDestinationSubdomains);
 }
 
-void NetworkConnectionToWebProcess::resetOriginAccessWhitelists()
+void NetworkConnectionToWebProcess::resetOriginAccessAllowLists()
 {
     SecurityPolicy::resetOriginAccessAllowlists();
 }

Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h (265080 => 265081)


--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h	2020-07-30 08:53:28 UTC (rev 265080)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h	2020-07-30 15:10:39 UTC (rev 265081)
@@ -272,9 +272,9 @@
     void requestStorageAccessUnderOpener(WebCore::RegistrableDomain&& domainInNeedOfStorageAccess, WebCore::PageIdentifier openerPageID, WebCore::RegistrableDomain&& openerDomain);
 #endif
 
-    void addOriginAccessWhitelistEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains);
-    void removeOriginAccessWhitelistEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains);
-    void resetOriginAccessWhitelists();
+    void addOriginAccessAllowListEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains);
+    void removeOriginAccessAllowListEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains);
+    void resetOriginAccessAllowLists();
 
     uint64_t nextMessageBatchIdentifier(Function<void()>&&);
 

Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in (265080 => 265081)


--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in	2020-07-30 08:53:28 UTC (rev 265080)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in	2020-07-30 15:10:39 UTC (rev 265081)
@@ -71,9 +71,9 @@
     RequestStorageAccessUnderOpener(WebCore::RegistrableDomain domainInNeedOfStorageAccess, WebCore::PageIdentifier openerPageID, WebCore::RegistrableDomain openerDomain)
 #endif
 
-    AddOriginAccessWhitelistEntry(String sourceOrigin, String destinationProtocol, String destinationHost, bool allowDestinationSubdomains);
-    RemoveOriginAccessWhitelistEntry(String sourceOrigin, String destinationProtocol, String destinationHost, bool allowDestinationSubdomains);
-    ResetOriginAccessWhitelists();
+    AddOriginAccessAllowListEntry(String sourceOrigin, String destinationProtocol, String destinationHost, bool allowDestinationSubdomains);
+    RemoveOriginAccessAllowListEntry(String sourceOrigin, String destinationProtocol, String destinationHost, bool allowDestinationSubdomains);
+    ResetOriginAccessAllowLists();
 
     GetNetworkLoadInformationResponse(uint64_t resourceLoadIdentifier) -> (WebCore::ResourceResponse response) Synchronous
     GetNetworkLoadIntermediateInformation(uint64_t resourceLoadIdentifier) -> (Vector<WebCore::NetworkTransactionInformation> transactions) Synchronous

Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp (265080 => 265081)


--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp	2020-07-30 08:53:28 UTC (rev 265080)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp	2020-07-30 15:10:39 UTC (rev 265081)
@@ -77,7 +77,7 @@
     encoder << shouldEnableMemoryPressureReliefLogging;
     encoder << shouldSuppressMemoryPressureHandler;
     encoder << shouldUseFontSmoothing;
-    encoder << fontWhitelist;
+    encoder << fontAllowList;
     encoder << terminationTimeout;
     encoder << overrideLanguages;
 #if USE(GSTREAMER)
@@ -279,7 +279,7 @@
         return false;
     if (!decoder.decode(parameters.shouldUseFontSmoothing))
         return false;
-    if (!decoder.decode(parameters.fontWhitelist))
+    if (!decoder.decode(parameters.fontAllowList))
         return false;
     if (!decoder.decode(parameters.terminationTimeout))
         return false;

Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.h (265080 => 265081)


--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.h	2020-07-30 08:53:28 UTC (rev 265080)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.h	2020-07-30 15:10:39 UTC (rev 265081)
@@ -106,7 +106,7 @@
     Vector<String> urlSchemesRegisteredAsCachePartitioned;
     Vector<String> urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest;
 
-    Vector<String> fontWhitelist;
+    Vector<String> fontAllowList;
     Vector<String> overrideLanguages;
 #if USE(GSTREAMER)
     Vector<String> gstreamerOptions;

Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitUserContent.cpp (265080 => 265081)


--- trunk/Source/WebKit/UIProcess/API/glib/WebKitUserContent.cpp	2020-07-30 08:53:28 UTC (rev 265080)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitUserContent.cpp	2020-07-30 15:10:39 UTC (rev 265081)
@@ -97,10 +97,10 @@
 }
 
 struct _WebKitUserStyleSheet {
-    _WebKitUserStyleSheet(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserStyleLevel level, const char* const* whitelist, const char* const* blacklist, API::ContentWorld& world)
+    _WebKitUserStyleSheet(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserStyleLevel level, const char* const* allowList, const char* const* blockList, API::ContentWorld& world)
         : userStyleSheet(adoptRef(new API::UserStyleSheet(UserStyleSheet {
             String::fromUTF8(source), URL { },
-            toStringVector(whitelist), toStringVector(blacklist),
+            toStringVector(allowList), toStringVector(blockList),
             toUserContentInjectedFrames(injectedFrames),
             toUserStyleLevel(level) }, world)))
         , referenceCount(1)
@@ -154,13 +154,13 @@
  * @source: Source code of the user style sheet.
  * @injected_frames: A #WebKitUserContentInjectedFrames value
  * @level: A #WebKitUserStyleLevel
- * @whitelist: (array zero-terminated=1) (allow-none): A whitelist of URI patterns or %NULL
- * @blacklist: (array zero-terminated=1) (allow-none): A blacklist of URI patterns or %NULL
+ * @allow_list: (array zero-terminated=1) (allow-none): An allow_list of URI patterns or %NULL
+ * @block_list: (array zero-terminated=1) (allow-none): A block_list of URI patterns or %NULL
  *
  * Creates a new user style sheet. Style sheets can be applied to some URIs
- * only by passing non-null values for @whitelist or @blacklist. Passing a
- * %NULL whitelist implies that all URIs are on the whitelist. The style
- * sheet is applied if an URI matches the whitelist and not the blacklist.
+ * only by passing non-null values for @allow_list or @block_list. Passing a
+ * %NULL allow_list implies that all URIs are on the allow_list. The style
+ * sheet is applied if an URI matches the allow_list and not the block_list.
  * URI patterns must be of the form `[protocol]://[host]/[path]`, where the
  * *host* and *path* components can contain the wildcard character (`*`) to
  * represent zero or more other characters.
@@ -169,11 +169,11 @@
  *
  * Since: 2.6
  */
-WebKitUserStyleSheet* webkit_user_style_sheet_new(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserStyleLevel level, const char* const* whitelist, const char* const* blacklist)
+WebKitUserStyleSheet* webkit_user_style_sheet_new(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserStyleLevel level, const char* const* allowList, const char* const* blockList)
 {
     g_return_val_if_fail(source, nullptr);
     WebKitUserStyleSheet* userStyleSheet = static_cast<WebKitUserStyleSheet*>(fastMalloc(sizeof(WebKitUserStyleSheet)));
-    new (userStyleSheet) WebKitUserStyleSheet(source, injectedFrames, level, whitelist, blacklist, API::ContentWorld::pageContentWorld());
+    new (userStyleSheet) WebKitUserStyleSheet(source, injectedFrames, level, allowList, blockList, API::ContentWorld::pageContentWorld());
     return userStyleSheet;
 }
 
@@ -183,8 +183,8 @@
  * @injected_frames: A #WebKitUserContentInjectedFrames value
  * @level: A #WebKitUserStyleLevel
  * @world_name: the name of a #WebKitScriptWorld
- * @whitelist: (array zero-terminated=1) (allow-none): A whitelist of URI patterns or %NULL
- * @blacklist: (array zero-terminated=1) (allow-none): A blacklist of URI patterns or %NULL
+ * @allow_list: (array zero-terminated=1) (allow-none): An allow_list of URI patterns or %NULL
+ * @block_list: (array zero-terminated=1) (allow-none): A block_list of URI patterns or %NULL
  *
  * Creates a new user style sheet for script world with name @world_name.
  * See webkit_user_style_sheet_new() for a full description.
@@ -193,13 +193,13 @@
  *
  * Since: 2.22
  */
-WebKitUserStyleSheet* webkit_user_style_sheet_new_for_world(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserStyleLevel level, const char* worldName, const char* const* whitelist, const char* const* blacklist)
+WebKitUserStyleSheet* webkit_user_style_sheet_new_for_world(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserStyleLevel level, const char* worldName, const char* const* allowList, const char* const* blockList)
 {
     g_return_val_if_fail(source, nullptr);
     g_return_val_if_fail(worldName, nullptr);
 
     WebKitUserStyleSheet* userStyleSheet = static_cast<WebKitUserStyleSheet*>(fastMalloc(sizeof(WebKitUserStyleSheet)));
-    new (userStyleSheet) WebKitUserStyleSheet(source, injectedFrames, level, whitelist, blacklist, webkitContentWorld(worldName));
+    new (userStyleSheet) WebKitUserStyleSheet(source, injectedFrames, level, allowList, blockList, webkitContentWorld(worldName));
     return userStyleSheet;
 }
 
@@ -209,10 +209,10 @@
 }
 
 struct _WebKitUserScript {
-    _WebKitUserScript(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserScriptInjectionTime injectionTime, const gchar* const* whitelist, const gchar* const* blacklist, API::ContentWorld& world)
+    _WebKitUserScript(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserScriptInjectionTime injectionTime, const gchar* const* allowList, const gchar* const* blockList, API::ContentWorld& world)
         : userScript(adoptRef(new API::UserScript(UserScript {
             String::fromUTF8(source), URL { },
-            toStringVector(whitelist), toStringVector(blacklist),
+            toStringVector(allowList), toStringVector(blockList),
             toUserScriptInjectionTime(injectionTime),
             toUserContentInjectedFrames(injectedFrames), WebCore::WaitForNotificationBeforeInjecting::No }, world)))
         , referenceCount(1)
@@ -266,13 +266,13 @@
  * @source: Source code of the user script.
  * @injected_frames: A #WebKitUserContentInjectedFrames value
  * @injection_time: A #WebKitUserScriptInjectionTime value
- * @whitelist: (array zero-terminated=1) (allow-none): A whitelist of URI patterns or %NULL
- * @blacklist: (array zero-terminated=1) (allow-none): A blacklist of URI patterns or %NULL
+ * @allow_list: (array zero-terminated=1) (allow-none): An allow_list of URI patterns or %NULL
+ * @block_list: (array zero-terminated=1) (allow-none): A block_list of URI patterns or %NULL
  *
  * Creates a new user script. Scripts can be applied to some URIs
- * only by passing non-null values for @whitelist or @blacklist. Passing a
- * %NULL whitelist implies that all URIs are on the whitelist. The script
- * is applied if an URI matches the whitelist and not the blacklist.
+ * only by passing non-null values for @allow_list or @block_list. Passing a
+ * %NULL allow_list implies that all URIs are on the allow_list. The script
+ * is applied if an URI matches the allow_list and not the block_list.
  * URI patterns must be of the form `[protocol]://[host]/[path]`, where the
  * *host* and *path* components can contain the wildcard character (`*`) to
  * represent zero or more other characters.
@@ -281,11 +281,11 @@
  *
  * Since: 2.6
  */
-WebKitUserScript* webkit_user_script_new(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserScriptInjectionTime injectionTime, const gchar* const* whitelist, const gchar* const* blacklist)
+WebKitUserScript* webkit_user_script_new(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserScriptInjectionTime injectionTime, const gchar* const* allowList, const gchar* const* blockList)
 {
     g_return_val_if_fail(source, nullptr);
     WebKitUserScript* userScript = static_cast<WebKitUserScript*>(fastMalloc(sizeof(WebKitUserScript)));
-    new (userScript) WebKitUserScript(source, injectedFrames, injectionTime, whitelist, blacklist, API::ContentWorld::pageContentWorld());
+    new (userScript) WebKitUserScript(source, injectedFrames, injectionTime, allowList, blockList, API::ContentWorld::pageContentWorld());
     return userScript;
 }
 
@@ -295,8 +295,8 @@
  * @injected_frames: A #WebKitUserContentInjectedFrames value
  * @injection_time: A #WebKitUserScriptInjectionTime value
  * @world_name: the name of a #WebKitScriptWorld
- * @whitelist: (array zero-terminated=1) (allow-none): A whitelist of URI patterns or %NULL
- * @blacklist: (array zero-terminated=1) (allow-none): A blacklist of URI patterns or %NULL
+ * @allow_list: (array zero-terminated=1) (allow-none): An allow_list of URI patterns or %NULL
+ * @block_list: (array zero-terminated=1) (allow-none): A block_list of URI patterns or %NULL
  *
  * Creates a new user script for script world with name @world_name.
  * See webkit_user_script_new() for a full description.
@@ -305,13 +305,13 @@
  *
  * Since: 2.22
  */
-WebKitUserScript* webkit_user_script_new_for_world(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserScriptInjectionTime injectionTime, const char* worldName, const gchar* const* whitelist, const gchar* const* blacklist)
+WebKitUserScript* webkit_user_script_new_for_world(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserScriptInjectionTime injectionTime, const char* worldName, const gchar* const* allowList, const gchar* const* blockList)
 {
     g_return_val_if_fail(source, nullptr);
     g_return_val_if_fail(worldName, nullptr);
 
     WebKitUserScript* userScript = static_cast<WebKitUserScript*>(fastMalloc(sizeof(WebKitUserScript)));
-    new (userScript) WebKitUserScript(source, injectedFrames, injectionTime, whitelist, blacklist, webkitContentWorld(worldName));
+    new (userScript) WebKitUserScript(source, injectedFrames, injectionTime, allowList, blockList, webkitContentWorld(worldName));
     return userScript;
 }
 

Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp (265080 => 265081)


--- trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp	2020-07-30 08:53:28 UTC (rev 265080)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp	2020-07-30 15:10:39 UTC (rev 265081)
@@ -1316,9 +1316,9 @@
     context->priv->processPool->setSandboxEnabled(enabled);
 }
 
-static bool pathIsBlacklisted(const char* path)
+static bool pathIsBlocked(const char* path)
 {
-    static const Vector<CString, 4> blacklistedPrefixes = {
+    static const Vector<CString, 4> blockedPrefixes = {
         // These are recreated by bwrap and it doesn't make sense to try and rebind them.
         "sys", "proc", "dev",
         "", // All of `/` isn't acceptable.
@@ -1328,7 +1328,7 @@
         return true;
 
     GUniquePtr<char*> splitPath(g_strsplit(path, G_DIR_SEPARATOR_S, 3));
-    return blacklistedPrefixes.contains(splitPath.get()[1]);
+    return blockedPrefixes.contains(splitPath.get()[1]);
 }
 
 /**
@@ -1352,7 +1352,7 @@
 {
     g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
 
-    if (pathIsBlacklisted(path)) {
+    if (pathIsBlocked(path)) {
         g_critical("Attempted to add disallowed path to sandbox: %s", path);
         return;
     }

Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitUserContent.h (265080 => 265081)


--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitUserContent.h	2020-07-30 08:53:28 UTC (rev 265080)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitUserContent.h	2020-07-30 15:10:39 UTC (rev 265081)
@@ -81,8 +81,8 @@
 webkit_user_style_sheet_new           (const gchar                    *source,
                                        WebKitUserContentInjectedFrames injected_frames,
                                        WebKitUserStyleLevel            level,
-                                       const gchar* const             *whitelist,
-                                       const gchar* const             *blacklist);
+                                       const gchar* const             *allow_list,
+                                       const gchar* const             *block_list);
 
 WEBKIT_API WebKitUserStyleSheet *
 webkit_user_style_sheet_new_for_world (const gchar                    *source,
@@ -89,8 +89,8 @@
                                        WebKitUserContentInjectedFrames injected_frames,
                                        WebKitUserStyleLevel            level,
                                        const gchar                    *world_name,
-                                       const gchar* const             *whitelist,
-                                       const gchar* const             *blacklist);
+                                       const gchar* const             *allow_list,
+                                       const gchar* const             *block_list);
 
 /**
  * WebKitUserScriptInjectionTime:
@@ -125,8 +125,8 @@
 webkit_user_script_new           (const gchar                    *source,
                                   WebKitUserContentInjectedFrames injected_frames,
                                   WebKitUserScriptInjectionTime   injection_time,
-                                  const gchar* const             *whitelist,
-                                  const gchar* const             *blacklist);
+                                  const gchar* const             *allow_list,
+                                  const gchar* const             *block_list);
 
 WEBKIT_API WebKitUserScript *
 webkit_user_script_new_for_world (const gchar                    *source,
@@ -133,8 +133,8 @@
                                   WebKitUserContentInjectedFrames injected_frames,
                                   WebKitUserScriptInjectionTime   injection_time,
                                   const gchar                    *world_name,
-                                  const gchar* const             *whitelist,
-                                  const gchar* const             *blacklist);
+                                  const gchar* const             *allow_list,
+                                  const gchar* const             *block_list);
 
 #define WEBKIT_TYPE_USER_CONTENT_FILTER   (webkit_user_content_filter_get_type())
 

Modified: trunk/Source/WebKit/UIProcess/API/wpe/WebKitUserContent.h (265080 => 265081)


--- trunk/Source/WebKit/UIProcess/API/wpe/WebKitUserContent.h	2020-07-30 08:53:28 UTC (rev 265080)
+++ trunk/Source/WebKit/UIProcess/API/wpe/WebKitUserContent.h	2020-07-30 15:10:39 UTC (rev 265081)
@@ -81,8 +81,8 @@
 webkit_user_style_sheet_new           (const gchar                    *source,
                                        WebKitUserContentInjectedFrames injected_frames,
                                        WebKitUserStyleLevel            level,
-                                       const gchar* const             *whitelist,
-                                       const gchar* const             *blacklist);
+                                       const gchar* const             *allow_list,
+                                       const gchar* const             *block_list);
 
 WEBKIT_API WebKitUserStyleSheet *
 webkit_user_style_sheet_new_for_world (const gchar                    *source,
@@ -89,8 +89,8 @@
                                        WebKitUserContentInjectedFrames injected_frames,
                                        WebKitUserStyleLevel            level,
                                        const gchar                    *world_name,
-                                       const gchar* const             *whitelist,
-                                       const gchar* const             *blacklist);
+                                       const gchar* const             *allow_list,
+                                       const gchar* const             *block_list);
 
 /**
  * WebKitUserScriptInjectionTime:
@@ -125,8 +125,8 @@
 webkit_user_script_new           (const gchar                    *source,
                                   WebKitUserContentInjectedFrames injected_frames,
                                   WebKitUserScriptInjectionTime   injection_time,
-                                  const gchar* const             *whitelist,
-                                  const gchar* const             *blacklist);
+                                  const gchar* const             *allow_list,
+                                  const gchar* const             *block_list);
 
 WEBKIT_API WebKitUserScript *
 webkit_user_script_new_for_world (const gchar                    *source,
@@ -133,8 +133,8 @@
                                   WebKitUserContentInjectedFrames injected_frames,
                                   WebKitUserScriptInjectionTime   injection_time,
                                   const gchar                    *world_name,
-                                  const gchar* const             *whitelist,
-                                  const gchar* const             *blacklist);
+                                  const gchar* const             *allow_list,
+                                  const gchar* const             *block_list);
 
 #define WEBKIT_TYPE_USER_CONTENT_FILTER   (webkit_user_content_filter_get_type())
 

Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (265080 => 265081)


--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm	2020-07-30 08:53:28 UTC (rev 265080)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm	2020-07-30 15:10:39 UTC (rev 265081)
@@ -333,7 +333,7 @@
         SandboxExtension::createHandleWithoutResolvingPath(m_resolvedPaths.containerTemporaryDirectory, SandboxExtension::Type::ReadWrite, parameters.containerTemporaryDirectoryExtensionHandle);
 #endif
 
-    parameters.fontWhitelist = m_fontWhitelist;
+    parameters.fontAllowList = m_fontAllowList;
 
     if (m_bundleParameters) {
         auto keyedArchiver = adoptNS([[NSKeyedArchiver alloc] initRequiringSecureCoding:YES]);

Modified: trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp (265080 => 265081)


--- trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp	2020-07-30 08:53:28 UTC (rev 265080)
+++ trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp	2020-07-30 15:10:39 UTC (rev 265081)
@@ -581,8 +581,8 @@
     // can do, and we should support code portability between different
     // container tools.
     //
-    // This syscall blacklist is copied from linux-user-chroot, which was in turn
-    // clearly influenced by the Sandstorm.io blacklist.
+    // This syscall block list is copied from linux-user-chroot, which was in turn
+    // clearly influenced by the Sandstorm.io block list.
     //
     // If you make any changes here, I suggest sending the changes along
     // to other sandbox maintainers. Using the libseccomp list is also
@@ -590,7 +590,7 @@
     // https://groups.google.com/forum/#!topic/libseccomp
     //
     // A non-exhaustive list of links to container tooling that might
-    // want to share this blacklist:
+    // want to share this block list:
     //
     //  https://github.com/sandstorm-io/sandstorm
     //    in src/sandstorm/supervisor.c++
@@ -603,7 +603,7 @@
     struct {
         int scall;
         struct scmp_arg_cmp* arg;
-    } syscallBlacklist[] = {
+    } syscallBlockList[] = {
         // Block dmesg
         { SCMP_SYS(syslog), nullptr },
         // Useless old syscall.
@@ -649,7 +649,7 @@
     if (!seccomp)
         g_error("Failed to init seccomp");
 
-    for (auto& rule : syscallBlacklist) {
+    for (auto& rule : syscallBlockList) {
         int scall = rule.scall;
         int r;
         if (rule.arg)

Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (265080 => 265081)


--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp	2020-07-30 08:53:28 UTC (rev 265080)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp	2020-07-30 15:10:39 UTC (rev 265081)
@@ -2104,11 +2104,11 @@
 
 void WebProcessPool::setFontAllowList(API::Array* array)
 {
-    m_fontWhitelist.clear();
+    m_fontAllowList.clear();
     if (array) {
         for (size_t i = 0; i < array->size(); ++i) {
             if (API::String* font = array->at<API::String>(i))
-                m_fontWhitelist.append(font->string());
+                m_fontAllowList.append(font->string());
         }
     }
 }

Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.h (265080 => 265081)


--- trunk/Source/WebKit/UIProcess/WebProcessPool.h	2020-07-30 08:53:28 UTC (rev 265080)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.h	2020-07-30 15:10:39 UTC (rev 265081)
@@ -685,7 +685,7 @@
     bool m_alwaysUsesComplexTextCodePath { false };
     bool m_shouldUseFontSmoothing { true };
 
-    Vector<String> m_fontWhitelist;
+    Vector<String> m_fontAllowList;
 
     // Messages that were posted before any pages were created.
     // The client should use initialization messages instead, so that a restarted process would get the same state.

Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp (265080 => 265081)


--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp	2020-07-30 08:53:28 UTC (rev 265080)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp	2020-07-30 15:10:39 UTC (rev 265081)
@@ -174,19 +174,19 @@
     WebKit::toImpl(bundleRef)->setSpatialNavigationEnabled(WebKit::toImpl(pageGroupRef), enabled);
 }
 
-void WKBundleAddOriginAccessWhitelistEntry(WKBundleRef bundleRef, WKStringRef sourceOrigin, WKStringRef destinationProtocol, WKStringRef destinationHost, bool allowDestinationSubdomains)
+void WKBundleAddOriginAccessAllowListEntry(WKBundleRef bundleRef, WKStringRef sourceOrigin, WKStringRef destinationProtocol, WKStringRef destinationHost, bool allowDestinationSubdomains)
 {
-    WebKit::toImpl(bundleRef)->addOriginAccessWhitelistEntry(WebKit::toWTFString(sourceOrigin), WebKit::toWTFString(destinationProtocol), WebKit::toWTFString(destinationHost), allowDestinationSubdomains);
+    WebKit::toImpl(bundleRef)->addOriginAccessAllowListEntry(WebKit::toWTFString(sourceOrigin), WebKit::toWTFString(destinationProtocol), WebKit::toWTFString(destinationHost), allowDestinationSubdomains);
 }
 
-void WKBundleRemoveOriginAccessWhitelistEntry(WKBundleRef bundleRef, WKStringRef sourceOrigin, WKStringRef destinationProtocol, WKStringRef destinationHost, bool allowDestinationSubdomains)
+void WKBundleRemoveOriginAccessAllowListEntry(WKBundleRef bundleRef, WKStringRef sourceOrigin, WKStringRef destinationProtocol, WKStringRef destinationHost, bool allowDestinationSubdomains)
 {
-    WebKit::toImpl(bundleRef)->removeOriginAccessWhitelistEntry(WebKit::toWTFString(sourceOrigin), WebKit::toWTFString(destinationProtocol), WebKit::toWTFString(destinationHost), allowDestinationSubdomains);
+    WebKit::toImpl(bundleRef)->removeOriginAccessAllowListEntry(WebKit::toWTFString(sourceOrigin), WebKit::toWTFString(destinationProtocol), WebKit::toWTFString(destinationHost), allowDestinationSubdomains);
 }
 
-void WKBundleResetOriginAccessWhitelists(WKBundleRef bundleRef)
+void WKBundleResetOriginAccessAllowLists(WKBundleRef bundleRef)
 {
-    WebKit::toImpl(bundleRef)->resetOriginAccessWhitelists();
+    WebKit::toImpl(bundleRef)->resetOriginAccessAllowLists();
 }
 
 void WKBundleSetAsynchronousSpellCheckingEnabled(WKBundleRef bundleRef, WKBundlePageGroupRef pageGroupRef, bool enabled)

Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h (265080 => 265081)


--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h	2020-07-30 08:53:28 UTC (rev 265080)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h	2020-07-30 15:10:39 UTC (rev 265081)
@@ -53,9 +53,9 @@
 WK_EXPORT void WKBundleSetPopupBlockingEnabled(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled);
 WK_EXPORT void WKBundleSetAuthorAndUserStylesEnabled(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled);
 WK_EXPORT void WKBundleSetSpatialNavigationEnabled(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled);
-WK_EXPORT void WKBundleAddOriginAccessWhitelistEntry(WKBundleRef bundle, WKStringRef, WKStringRef, WKStringRef, bool);
-WK_EXPORT void WKBundleRemoveOriginAccessWhitelistEntry(WKBundleRef bundle, WKStringRef, WKStringRef, WKStringRef, bool);
-WK_EXPORT void WKBundleResetOriginAccessWhitelists(WKBundleRef bundle);
+WK_EXPORT void WKBundleAddOriginAccessAllowListEntry(WKBundleRef bundle, WKStringRef, WKStringRef, WKStringRef, bool);
+WK_EXPORT void WKBundleRemoveOriginAccessAllowListEntry(WKBundleRef bundle, WKStringRef, WKStringRef, WKStringRef, bool);
+WK_EXPORT void WKBundleResetOriginAccessAllowLists(WKBundleRef bundle);
 WK_EXPORT int WKBundleNumberOfPages(WKBundleRef bundle, WKBundleFrameRef frameRef, double pageWidthInPixels, double pageHeightInPixels);
 WK_EXPORT int WKBundlePageNumberForElementById(WKBundleRef bundle, WKBundleFrameRef frameRef, WKStringRef idRef, double pageWidthInPixels, double pageHeightInPixels);
 WK_EXPORT WKStringRef WKBundlePageSizeAndMarginsInPixels(WKBundleRef bundle, WKBundleFrameRef frameRef, int, int, int, int, int, int, int);

Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp (265080 => 265081)


--- trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp	2020-07-30 08:53:28 UTC (rev 265080)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp	2020-07-30 15:10:39 UTC (rev 265081)
@@ -396,23 +396,23 @@
         (*iter)->settings().setSpatialNavigationEnabled(enabled);
 }
 
-void InjectedBundle::addOriginAccessWhitelistEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains)
+void InjectedBundle::addOriginAccessAllowListEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains)
 {
     SecurityPolicy::addOriginAccessAllowlistEntry(SecurityOrigin::createFromString(sourceOrigin).get(), destinationProtocol, destinationHost, allowDestinationSubdomains);
-    WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::AddOriginAccessWhitelistEntry { sourceOrigin, destinationProtocol, destinationHost, allowDestinationSubdomains }, 0);
+    WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::AddOriginAccessAllowListEntry { sourceOrigin, destinationProtocol, destinationHost, allowDestinationSubdomains }, 0);
 
 }
 
-void InjectedBundle::removeOriginAccessWhitelistEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains)
+void InjectedBundle::removeOriginAccessAllowListEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains)
 {
     SecurityPolicy::removeOriginAccessAllowlistEntry(SecurityOrigin::createFromString(sourceOrigin).get(), destinationProtocol, destinationHost, allowDestinationSubdomains);
-    WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::RemoveOriginAccessWhitelistEntry { sourceOrigin, destinationProtocol, destinationHost, allowDestinationSubdomains }, 0);
+    WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::RemoveOriginAccessAllowListEntry { sourceOrigin, destinationProtocol, destinationHost, allowDestinationSubdomains }, 0);
 }
 
-void InjectedBundle::resetOriginAccessWhitelists()
+void InjectedBundle::resetOriginAccessAllowLists()
 {
     SecurityPolicy::resetOriginAccessAllowlists();
-    WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::ResetOriginAccessWhitelists { }, 0);
+    WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::ResetOriginAccessAllowLists { }, 0);
 }
 
 void InjectedBundle::setAsynchronousSpellCheckingEnabled(WebPageGroupProxy* pageGroup, bool enabled)

Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.h (265080 => 265081)


--- trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.h	2020-07-30 08:53:28 UTC (rev 265080)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.h	2020-07-30 15:10:39 UTC (rev 265081)
@@ -107,9 +107,9 @@
     void setPopupBlockingEnabled(WebPageGroupProxy*, bool);
     void setAuthorAndUserStylesEnabled(WebPageGroupProxy*, bool);
     void setSpatialNavigationEnabled(WebPageGroupProxy*, bool);
-    void addOriginAccessWhitelistEntry(const String&, const String&, const String&, bool);
-    void removeOriginAccessWhitelistEntry(const String&, const String&, const String&, bool);
-    void resetOriginAccessWhitelists();
+    void addOriginAccessAllowListEntry(const String&, const String&, const String&, bool);
+    void removeOriginAccessAllowListEntry(const String&, const String&, const String&, bool);
+    void resetOriginAccessAllowLists();
     void setAsynchronousSpellCheckingEnabled(WebPageGroupProxy*, bool);
     int numberOfPages(WebFrame*, double, double);
     int pageNumberForElementById(WebFrame*, const String&, double, double);

Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (265080 => 265081)


--- trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	2020-07-30 08:53:28 UTC (rev 265080)
+++ trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	2020-07-30 15:10:39 UTC (rev 265081)
@@ -245,7 +245,7 @@
     [NSURLCache setSharedURLCache:urlCache.get()];
 
 #if PLATFORM(MAC)
-    WebCore::FontCache::setFontAllowlist(parameters.fontWhitelist);
+    WebCore::FontCache::setFontAllowlist(parameters.fontAllowList);
 #endif
 
     m_compositingRenderServerPort = WTFMove(parameters.acceleratedCompositingPort);

Modified: trunk/Tools/ChangeLog (265080 => 265081)


--- trunk/Tools/ChangeLog	2020-07-30 08:53:28 UTC (rev 265080)
+++ trunk/Tools/ChangeLog	2020-07-30 15:10:39 UTC (rev 265081)
@@ -1,3 +1,16 @@
+2020-07-30  Alex Christensen  <[email protected]>
+
+        Remove non-inclusive terminology from WebKit variable names and test-only SPI
+        https://bugs.webkit.org/show_bug.cgi?id=214941
+
+        Reviewed by Michael Catanzaro.
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+        (WTR::InjectedBundle::beginTesting):
+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+        (WTR::TestRunner::addOriginAccessWhitelistEntry):
+        (WTR::TestRunner::removeOriginAccessWhitelistEntry):
+
 2020-07-15  Carlos Garcia Campos  <[email protected]>
 
         [GTK4] Enable API tests

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (265080 => 265081)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp	2020-07-30 08:53:28 UTC (rev 265080)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp	2020-07-30 15:10:39 UTC (rev 265081)
@@ -628,7 +628,7 @@
 
     WKBundleClearAllDatabases(m_bundle);
     WKBundlePageClearApplicationCache(page()->page());
-    WKBundleResetOriginAccessWhitelists(m_bundle);
+    WKBundleResetOriginAccessAllowLists(m_bundle);
     WKBundleClearResourceLoadStatistics(m_bundle);
 
     // [WK2] REGRESSION(r128623): It made layout tests extremely slow

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (265080 => 265081)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp	2020-07-30 08:53:28 UTC (rev 265080)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp	2020-07-30 15:10:39 UTC (rev 265081)
@@ -573,12 +573,12 @@
 
 void TestRunner::addOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
 {
-    WKBundleAddOriginAccessWhitelistEntry(InjectedBundle::singleton().bundle(), toWK(sourceOrigin).get(), toWK(destinationProtocol).get(), toWK(destinationHost).get(), allowDestinationSubdomains);
+    WKBundleAddOriginAccessAllowListEntry(InjectedBundle::singleton().bundle(), toWK(sourceOrigin).get(), toWK(destinationProtocol).get(), toWK(destinationHost).get(), allowDestinationSubdomains);
 }
 
 void TestRunner::removeOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
 {
-    WKBundleRemoveOriginAccessWhitelistEntry(InjectedBundle::singleton().bundle(), toWK(sourceOrigin).get(), toWK(destinationProtocol).get(), toWK(destinationHost).get(), allowDestinationSubdomains);
+    WKBundleRemoveOriginAccessAllowListEntry(InjectedBundle::singleton().bundle(), toWK(sourceOrigin).get(), toWK(destinationProtocol).get(), toWK(destinationHost).get(), allowDestinationSubdomains);
 }
 
 bool TestRunner::isPageBoxVisible(int pageIndex)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to