Changeset 265081 in webkit


Ignore:
Timestamp:
Jul 30, 2020 8:10:39 AM (4 years ago)
Author:
commit-queue@webkit.org
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 <​achristensen@webkit.org> 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):

Location:
trunk
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r265080 r265081  
     12020-07-30  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove non-inclusive terminology from WebKit variable names and test-only SPI
     4        https://bugs.webkit.org/show_bug.cgi?id=214941
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
     9        (WebKit::NetworkConnectionToWebProcess::addOriginAccessAllowListEntry):
     10        (WebKit::NetworkConnectionToWebProcess::removeOriginAccessAllowListEntry):
     11        (WebKit::NetworkConnectionToWebProcess::resetOriginAccessAllowLists):
     12        (WebKit::NetworkConnectionToWebProcess::addOriginAccessWhitelistEntry): Deleted.
     13        (WebKit::NetworkConnectionToWebProcess::removeOriginAccessWhitelistEntry): Deleted.
     14        (WebKit::NetworkConnectionToWebProcess::resetOriginAccessWhitelists): Deleted.
     15        * NetworkProcess/NetworkConnectionToWebProcess.h:
     16        * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
     17        * Shared/WebProcessCreationParameters.cpp:
     18        (WebKit::WebProcessCreationParameters::encode const):
     19        (WebKit::WebProcessCreationParameters::decode):
     20        * Shared/WebProcessCreationParameters.h:
     21        * UIProcess/API/glib/WebKitUserContent.cpp:
     22        (_WebKitUserStyleSheet::_WebKitUserStyleSheet):
     23        (webkit_user_style_sheet_new):
     24        (webkit_user_style_sheet_new_for_world):
     25        (_WebKitUserScript::_WebKitUserScript):
     26        (webkit_user_script_new):
     27        (webkit_user_script_new_for_world):
     28        * UIProcess/API/glib/WebKitWebContext.cpp:
     29        (pathIsBlocked):
     30        (webkit_web_context_add_path_to_sandbox):
     31        (pathIsBlacklisted): Deleted.
     32        * UIProcess/API/gtk/WebKitUserContent.h:
     33        * UIProcess/API/wpe/WebKitUserContent.h:
     34        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
     35        (WebKit::WebProcessPool::platformInitializeWebProcess):
     36        * UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
     37        (WebKit::setupSeccomp):
     38        * UIProcess/WebProcessPool.cpp:
     39        (WebKit::WebProcessPool::setFontAllowList):
     40        * UIProcess/WebProcessPool.h:
     41        * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
     42        (WKBundleAddOriginAccessAllowListEntry):
     43        (WKBundleRemoveOriginAccessAllowListEntry):
     44        (WKBundleResetOriginAccessAllowLists):
     45        (WKBundleAddOriginAccessWhitelistEntry): Deleted.
     46        (WKBundleRemoveOriginAccessWhitelistEntry): Deleted.
     47        (WKBundleResetOriginAccessWhitelists): Deleted.
     48        * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h:
     49        * WebProcess/InjectedBundle/InjectedBundle.cpp:
     50        (WebKit::InjectedBundle::addOriginAccessAllowListEntry):
     51        (WebKit::InjectedBundle::removeOriginAccessAllowListEntry):
     52        (WebKit::InjectedBundle::resetOriginAccessAllowLists):
     53        (WebKit::InjectedBundle::addOriginAccessWhitelistEntry): Deleted.
     54        (WebKit::InjectedBundle::removeOriginAccessWhitelistEntry): Deleted.
     55        (WebKit::InjectedBundle::resetOriginAccessWhitelists): Deleted.
     56        * WebProcess/InjectedBundle/InjectedBundle.h:
     57        * WebProcess/cocoa/WebProcessCocoa.mm:
     58        (WebKit::WebProcess::platformInitializeWebProcess):
     59
    1602020-07-15  Carlos Garcia Campos  <cgarcia@igalia.com>
    261

  • trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp

    r264846 r265081  
    917917#endif
    918918
    919 void NetworkConnectionToWebProcess::addOriginAccessWhitelistEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains)
     919void NetworkConnectionToWebProcess::addOriginAccessAllowListEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains)
    920920{
    921921    SecurityPolicy::addOriginAccessAllowlistEntry(SecurityOrigin::createFromString(sourceOrigin).get(), destinationProtocol, destinationHost, allowDestinationSubdomains);
    922922}
    923923
    924 void NetworkConnectionToWebProcess::removeOriginAccessWhitelistEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains)
     924void NetworkConnectionToWebProcess::removeOriginAccessAllowListEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains)
    925925{
    926926    SecurityPolicy::removeOriginAccessAllowlistEntry(SecurityOrigin::createFromString(sourceOrigin).get(), destinationProtocol, destinationHost, allowDestinationSubdomains);
    927927}
    928928
    929 void NetworkConnectionToWebProcess::resetOriginAccessWhitelists()
     929void NetworkConnectionToWebProcess::resetOriginAccessAllowLists()
    930930{
    931931    SecurityPolicy::resetOriginAccessAllowlists();

  • trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h

    r264665 r265081  
    273273#endif
    274274
    275     void addOriginAccessWhitelistEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains);
    276     void removeOriginAccessWhitelistEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains);
    277     void resetOriginAccessWhitelists();
     275    void addOriginAccessAllowListEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains);
     276    void removeOriginAccessAllowListEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains);
     277    void resetOriginAccessAllowLists();
    278278
    279279    uint64_t nextMessageBatchIdentifier(Function<void()>&&);

  • trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in

    r264665 r265081  
    7272#endif
    7373
    74     AddOriginAccessWhitelistEntry(String sourceOrigin, String destinationProtocol, String destinationHost, bool allowDestinationSubdomains);
    75     RemoveOriginAccessWhitelistEntry(String sourceOrigin, String destinationProtocol, String destinationHost, bool allowDestinationSubdomains);
    76     ResetOriginAccessWhitelists();
     74    AddOriginAccessAllowListEntry(String sourceOrigin, String destinationProtocol, String destinationHost, bool allowDestinationSubdomains);
     75    RemoveOriginAccessAllowListEntry(String sourceOrigin, String destinationProtocol, String destinationHost, bool allowDestinationSubdomains);
     76    ResetOriginAccessAllowLists();
    7777
    7878    GetNetworkLoadInformationResponse(uint64_t resourceLoadIdentifier) -> (WebCore::ResourceResponse response) Synchronous

  • trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp

    r264476 r265081  
    7878    encoder << shouldSuppressMemoryPressureHandler;
    7979    encoder << shouldUseFontSmoothing;
    80     encoder << fontWhitelist;
     80    encoder << fontAllowList;
    8181    encoder << terminationTimeout;
    8282    encoder << overrideLanguages;
    … …  
    280280    if (!decoder.decode(parameters.shouldUseFontSmoothing))
    281281        return false;
    282     if (!decoder.decode(parameters.fontWhitelist))
     282    if (!decoder.decode(parameters.fontAllowList))
    283283        return false;
    284284    if (!decoder.decode(parameters.terminationTimeout))

  • trunk/Source/WebKit/Shared/WebProcessCreationParameters.h

    r264476 r265081  
    107107    Vector<String> urlSchemesRegisteredAsCanDisplayOnlyIfCanRequest;
    108108
    109     Vector<String> fontWhitelist;
     109    Vector<String> fontAllowList;
    110110    Vector<String> overrideLanguages;
    111111#if USE(GSTREAMER)

  • trunk/Source/WebKit/UIProcess/API/glib/WebKitUserContent.cpp

    r259523 r265081  
    9898
    9999struct _WebKitUserStyleSheet {
    100     _WebKitUserStyleSheet(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserStyleLevel level, const char* const* whitelist, const char* const* blacklist, API::ContentWorld& world)
     100    _WebKitUserStyleSheet(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserStyleLevel level, const char* const* allowList, const char* const* blockList, API::ContentWorld& world)
    101101        : userStyleSheet(adoptRef(new API::UserStyleSheet(UserStyleSheet {
    102102            String::fromUTF8(source), URL { },
    103             toStringVector(whitelist), toStringVector(blacklist),
     103            toStringVector(allowList), toStringVector(blockList),
    104104            toUserContentInjectedFrames(injectedFrames),
    105105            toUserStyleLevel(level) }, world)))
    … …  
    155155 * @injected_frames: A #WebKitUserContentInjectedFrames value
    156156 * @level: A #WebKitUserStyleLevel
    157  * @whitelist: (array zero-terminated=1) (allow-none): A whitelist of URI patterns or %NULL
    158  * @blacklist: (array zero-terminated=1) (allow-none): A blacklist of URI patterns or %NULL
     157 * @allow_list: (array zero-terminated=1) (allow-none): An allow_list of URI patterns or %NULL
     158 * @block_list: (array zero-terminated=1) (allow-none): A block_list of URI patterns or %NULL
    159159 *
    160160 * Creates a new user style sheet. Style sheets can be applied to some URIs
    161  * only by passing non-null values for @whitelist or @blacklist. Passing a
    162  * %NULL whitelist implies that all URIs are on the whitelist. The style
    163  * sheet is applied if an URI matches the whitelist and not the blacklist.
     161 * only by passing non-null values for @allow_list or @block_list. Passing a
     162 * %NULL allow_list implies that all URIs are on the allow_list. The style
     163 * sheet is applied if an URI matches the allow_list and not the block_list.
    164164 * URI patterns must be of the form `[protocol]://[host]/[path]`, where the
    165165 * *host* and *path* components can contain the wildcard character (`*`) to
    … …  
    170170 * Since: 2.6
    171171 */
    172 WebKitUserStyleSheet* webkit_user_style_sheet_new(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserStyleLevel level, const char* const* whitelist, const char* const* blacklist)
     172WebKitUserStyleSheet* webkit_user_style_sheet_new(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserStyleLevel level, const char* const* allowList, const char* const* blockList)
    173173{
    174174    g_return_val_if_fail(source, nullptr);
    175175    WebKitUserStyleSheet* userStyleSheet = static_cast<WebKitUserStyleSheet*>(fastMalloc(sizeof(WebKitUserStyleSheet)));
    176     new (userStyleSheet) WebKitUserStyleSheet(source, injectedFrames, level, whitelist, blacklist, API::ContentWorld::pageContentWorld());
     176    new (userStyleSheet) WebKitUserStyleSheet(source, injectedFrames, level, allowList, blockList, API::ContentWorld::pageContentWorld());
    177177    return userStyleSheet;
    178178}
    … …  
    184184 * @level: A #WebKitUserStyleLevel
    185185 * @world_name: the name of a #WebKitScriptWorld
    186  * @whitelist: (array zero-terminated=1) (allow-none): A whitelist of URI patterns or %NULL
    187  * @blacklist: (array zero-terminated=1) (allow-none): A blacklist of URI patterns or %NULL
     186 * @allow_list: (array zero-terminated=1) (allow-none): An allow_list of URI patterns or %NULL
     187 * @block_list: (array zero-terminated=1) (allow-none): A block_list of URI patterns or %NULL
    188188 *
    189189 * Creates a new user style sheet for script world with name @world_name.
    … …  
    194194 * Since: 2.22
    195195 */
    196 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)
     196WebKitUserStyleSheet* 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)
    197197{
    198198    g_return_val_if_fail(source, nullptr);
    … …  
    200200
    201201    WebKitUserStyleSheet* userStyleSheet = static_cast<WebKitUserStyleSheet*>(fastMalloc(sizeof(WebKitUserStyleSheet)));
    202     new (userStyleSheet) WebKitUserStyleSheet(source, injectedFrames, level, whitelist, blacklist, webkitContentWorld(worldName));
     202    new (userStyleSheet) WebKitUserStyleSheet(source, injectedFrames, level, allowList, blockList, webkitContentWorld(worldName));
    203203    return userStyleSheet;
    204204}
    … …  
    210210
    211211struct _WebKitUserScript {
    212     _WebKitUserScript(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserScriptInjectionTime injectionTime, const gchar* const* whitelist, const gchar* const* blacklist, API::ContentWorld& world)
     212    _WebKitUserScript(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserScriptInjectionTime injectionTime, const gchar* const* allowList, const gchar* const* blockList, API::ContentWorld& world)
    213213        : userScript(adoptRef(new API::UserScript(UserScript {
    214214            String::fromUTF8(source), URL { },
    215             toStringVector(whitelist), toStringVector(blacklist),
     215            toStringVector(allowList), toStringVector(blockList),
    216216            toUserScriptInjectionTime(injectionTime),
    217217            toUserContentInjectedFrames(injectedFrames), WebCore::WaitForNotificationBeforeInjecting::No }, world)))
    … …  
    267267 * @injected_frames: A #WebKitUserContentInjectedFrames value
    268268 * @injection_time: A #WebKitUserScriptInjectionTime value
    269  * @whitelist: (array zero-terminated=1) (allow-none): A whitelist of URI patterns or %NULL
    270  * @blacklist: (array zero-terminated=1) (allow-none): A blacklist of URI patterns or %NULL
     269 * @allow_list: (array zero-terminated=1) (allow-none): An allow_list of URI patterns or %NULL
     270 * @block_list: (array zero-terminated=1) (allow-none): A block_list of URI patterns or %NULL
    271271 *
    272272 * Creates a new user script. Scripts can be applied to some URIs
    273  * only by passing non-null values for @whitelist or @blacklist. Passing a
    274  * %NULL whitelist implies that all URIs are on the whitelist. The script
    275  * is applied if an URI matches the whitelist and not the blacklist.
     273 * only by passing non-null values for @allow_list or @block_list. Passing a
     274 * %NULL allow_list implies that all URIs are on the allow_list. The script
     275 * is applied if an URI matches the allow_list and not the block_list.
    276276 * URI patterns must be of the form `[protocol]://[host]/[path]`, where the
    277277 * *host* and *path* components can contain the wildcard character (`*`) to
    … …  
    282282 * Since: 2.6
    283283 */
    284 WebKitUserScript* webkit_user_script_new(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserScriptInjectionTime injectionTime, const gchar* const* whitelist, const gchar* const* blacklist)
     284WebKitUserScript* webkit_user_script_new(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserScriptInjectionTime injectionTime, const gchar* const* allowList, const gchar* const* blockList)
    285285{
    286286    g_return_val_if_fail(source, nullptr);
    287287    WebKitUserScript* userScript = static_cast<WebKitUserScript*>(fastMalloc(sizeof(WebKitUserScript)));
    288     new (userScript) WebKitUserScript(source, injectedFrames, injectionTime, whitelist, blacklist, API::ContentWorld::pageContentWorld());
     288    new (userScript) WebKitUserScript(source, injectedFrames, injectionTime, allowList, blockList, API::ContentWorld::pageContentWorld());
    289289    return userScript;
    290290}
    … …  
    296296 * @injection_time: A #WebKitUserScriptInjectionTime value
    297297 * @world_name: the name of a #WebKitScriptWorld
    298  * @whitelist: (array zero-terminated=1) (allow-none): A whitelist of URI patterns or %NULL
    299  * @blacklist: (array zero-terminated=1) (allow-none): A blacklist of URI patterns or %NULL
     298 * @allow_list: (array zero-terminated=1) (allow-none): An allow_list of URI patterns or %NULL
     299 * @block_list: (array zero-terminated=1) (allow-none): A block_list of URI patterns or %NULL
    300300 *
    301301 * Creates a new user script for script world with name @world_name.
    … …  
    306306 * Since: 2.22
    307307 */
    308 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)
     308WebKitUserScript* webkit_user_script_new_for_world(const gchar* source, WebKitUserContentInjectedFrames injectedFrames, WebKitUserScriptInjectionTime injectionTime, const char* worldName, const gchar* const* allowList, const gchar* const* blockList)
    309309{
    310310    g_return_val_if_fail(source, nullptr);
    … …  
    312312
    313313    WebKitUserScript* userScript = static_cast<WebKitUserScript*>(fastMalloc(sizeof(WebKitUserScript)));
    314     new (userScript) WebKitUserScript(source, injectedFrames, injectionTime, whitelist, blacklist, webkitContentWorld(worldName));
     314    new (userScript) WebKitUserScript(source, injectedFrames, injectionTime, allowList, blockList, webkitContentWorld(worldName));
    315315    return userScript;
    316316}

  • trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp

    r263369 r265081  
    13171317}
    13181318
    1319 static bool pathIsBlacklisted(const char* path)
    1320 {
    1321     static const Vector<CString, 4> blacklistedPrefixes = {
     1319static bool pathIsBlocked(const char* path)
     1320{
     1321    static const Vector<CString, 4> blockedPrefixes = {
    13221322        // These are recreated by bwrap and it doesn't make sense to try and rebind them.
    13231323        "sys", "proc", "dev",
    … …  
    13291329
    13301330    GUniquePtr<char*> splitPath(g_strsplit(path, G_DIR_SEPARATOR_S, 3));
    1331     return blacklistedPrefixes.contains(splitPath.get()[1]);
     1331    return blockedPrefixes.contains(splitPath.get()[1]);
    13321332}
    13331333
    … …  
    13531353    g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
    13541354
    1355     if (pathIsBlacklisted(path)) {
     1355    if (pathIsBlocked(path)) {
    13561356        g_critical("Attempted to add disallowed path to sandbox: %s", path);
    13571357        return;

  • trunk/Source/WebKit/UIProcess/API/gtk/WebKitUserContent.h

    r241790 r265081  
    8282                                       WebKitUserContentInjectedFrames injected_frames,
    8383                                       WebKitUserStyleLevel            level,
    84                                        const gchar* const             *whitelist,
    85                                        const gchar* const             *blacklist);
     84                                       const gchar* const             *allow_list,
     85                                       const gchar* const             *block_list);
    8686
    8787WEBKIT_API WebKitUserStyleSheet *
    … …  
    9090                                       WebKitUserStyleLevel            level,
    9191                                       const gchar                    *world_name,
    92                                        const gchar* const             *whitelist,
    93                                        const gchar* const             *blacklist);
     92                                       const gchar* const             *allow_list,
     93                                       const gchar* const             *block_list);
    9494
    9595/**
    … …  
    126126                                  WebKitUserContentInjectedFrames injected_frames,
    127127                                  WebKitUserScriptInjectionTime   injection_time,
    128                                   const gchar* const             *whitelist,
    129                                   const gchar* const             *blacklist);
     128                                  const gchar* const             *allow_list,
     129                                  const gchar* const             *block_list);
    130130
    131131WEBKIT_API WebKitUserScript *
    … …  
    134134                                  WebKitUserScriptInjectionTime   injection_time,
    135135                                  const gchar                    *world_name,
    136                                   const gchar* const             *whitelist,
    137                                   const gchar* const             *blacklist);
     136                                  const gchar* const             *allow_list,
     137                                  const gchar* const             *block_list);
    138138
    139139#define WEBKIT_TYPE_USER_CONTENT_FILTER   (webkit_user_content_filter_get_type())

  • trunk/Source/WebKit/UIProcess/API/wpe/WebKitUserContent.h

    r241790 r265081  
    8282                                       WebKitUserContentInjectedFrames injected_frames,
    8383                                       WebKitUserStyleLevel            level,
    84                                        const gchar* const             *whitelist,
    85                                        const gchar* const             *blacklist);
     84                                       const gchar* const             *allow_list,
     85                                       const gchar* const             *block_list);
    8686
    8787WEBKIT_API WebKitUserStyleSheet *
    … …  
    9090                                       WebKitUserStyleLevel            level,
    9191                                       const gchar                    *world_name,
    92                                        const gchar* const             *whitelist,
    93                                        const gchar* const             *blacklist);
     92                                       const gchar* const             *allow_list,
     93                                       const gchar* const             *block_list);
    9494
    9595/**
    … …  
    126126                                  WebKitUserContentInjectedFrames injected_frames,
    127127                                  WebKitUserScriptInjectionTime   injection_time,
    128                                   const gchar* const             *whitelist,
    129                                   const gchar* const             *blacklist);
     128                                  const gchar* const             *allow_list,
     129                                  const gchar* const             *block_list);
    130130
    131131WEBKIT_API WebKitUserScript *
    … …  
    134134                                  WebKitUserScriptInjectionTime   injection_time,
    135135                                  const gchar                    *world_name,
    136                                   const gchar* const             *whitelist,
    137                                   const gchar* const             *blacklist);
     136                                  const gchar* const             *allow_list,
     137                                  const gchar* const             *block_list);
    138138
    139139#define WEBKIT_TYPE_USER_CONTENT_FILTER   (webkit_user_content_filter_get_type())

  • trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm

    r265056 r265081  
    334334#endif
    335335
    336     parameters.fontWhitelist = m_fontWhitelist;
     336    parameters.fontAllowList = m_fontAllowList;
    337337
    338338    if (m_bundleParameters) {

  • trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp

    r263966 r265081  
    582582    // container tools.
    583583    //
    584     // This syscall blacklist is copied from linux-user-chroot, which was in turn
    585     // clearly influenced by the Sandstorm.io blacklist.
     584    // This syscall block list is copied from linux-user-chroot, which was in turn
     585    // clearly influenced by the Sandstorm.io block list.
    586586    //
    587587    // If you make any changes here, I suggest sending the changes along
    … …  
    591591    //
    592592    // A non-exhaustive list of links to container tooling that might
    593     // want to share this blacklist:
     593    // want to share this block list:
    594594    //
    595595    //  https://github.com/sandstorm-io/sandstorm
    … …  
    604604        int scall;
    605605        struct scmp_arg_cmp* arg;
    606     } syscallBlacklist[] = {
     606    } syscallBlockList[] = {
    607607        // Block dmesg
    608608        { SCMP_SYS(syslog), nullptr },
    … …  
    650650        g_error("Failed to init seccomp");
    651651
    652     for (auto& rule : syscallBlacklist) {
     652    for (auto& rule : syscallBlockList) {
    653653        int scall = rule.scall;
    654654        int r;

  • trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

    r265063 r265081  
    21052105void WebProcessPool::setFontAllowList(API::Array* array)
    21062106{
    2107     m_fontWhitelist.clear();
     2107    m_fontAllowList.clear();
    21082108    if (array) {
    21092109        for (size_t i = 0; i < array->size(); ++i) {
    21102110            if (API::String* font = array->at<API::String>(i))
    2111                 m_fontWhitelist.append(font->string());
     2111                m_fontAllowList.append(font->string());
    21122112        }
    21132113    }

  • trunk/Source/WebKit/UIProcess/WebProcessPool.h

    r264874 r265081  
    686686    bool m_shouldUseFontSmoothing { true };
    687687
    688     Vector<String> m_fontWhitelist;
     688    Vector<String> m_fontAllowList;
    689689
    690690    // Messages that were posted before any pages were created.

  • trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp

    r259159 r265081  
    175175}
    176176
    177 void WKBundleAddOriginAccessWhitelistEntry(WKBundleRef bundleRef, WKStringRef sourceOrigin, WKStringRef destinationProtocol, WKStringRef destinationHost, bool allowDestinationSubdomains)
    178 {
    179     WebKit::toImpl(bundleRef)->addOriginAccessWhitelistEntry(WebKit::toWTFString(sourceOrigin), WebKit::toWTFString(destinationProtocol), WebKit::toWTFString(destinationHost), allowDestinationSubdomains);
    180 }
    181 
    182 void WKBundleRemoveOriginAccessWhitelistEntry(WKBundleRef bundleRef, WKStringRef sourceOrigin, WKStringRef destinationProtocol, WKStringRef destinationHost, bool allowDestinationSubdomains)
    183 {
    184     WebKit::toImpl(bundleRef)->removeOriginAccessWhitelistEntry(WebKit::toWTFString(sourceOrigin), WebKit::toWTFString(destinationProtocol), WebKit::toWTFString(destinationHost), allowDestinationSubdomains);
    185 }
    186 
    187 void WKBundleResetOriginAccessWhitelists(WKBundleRef bundleRef)
    188 {
    189     WebKit::toImpl(bundleRef)->resetOriginAccessWhitelists();
     177void WKBundleAddOriginAccessAllowListEntry(WKBundleRef bundleRef, WKStringRef sourceOrigin, WKStringRef destinationProtocol, WKStringRef destinationHost, bool allowDestinationSubdomains)
     178{
     179    WebKit::toImpl(bundleRef)->addOriginAccessAllowListEntry(WebKit::toWTFString(sourceOrigin), WebKit::toWTFString(destinationProtocol), WebKit::toWTFString(destinationHost), allowDestinationSubdomains);
     180}
     181
     182void WKBundleRemoveOriginAccessAllowListEntry(WKBundleRef bundleRef, WKStringRef sourceOrigin, WKStringRef destinationProtocol, WKStringRef destinationHost, bool allowDestinationSubdomains)
     183{
     184    WebKit::toImpl(bundleRef)->removeOriginAccessAllowListEntry(WebKit::toWTFString(sourceOrigin), WebKit::toWTFString(destinationProtocol), WebKit::toWTFString(destinationHost), allowDestinationSubdomains);
     185}
     186
     187void WKBundleResetOriginAccessAllowLists(WKBundleRef bundleRef)
     188{
     189    WebKit::toImpl(bundleRef)->resetOriginAccessAllowLists();
    190190}
    191191

  • trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h

    r263192 r265081  
    5454WK_EXPORT void WKBundleSetAuthorAndUserStylesEnabled(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled);
    5555WK_EXPORT void WKBundleSetSpatialNavigationEnabled(WKBundleRef bundle, WKBundlePageGroupRef pageGroup, bool enabled);
    56 WK_EXPORT void WKBundleAddOriginAccessWhitelistEntry(WKBundleRef bundle, WKStringRef, WKStringRef, WKStringRef, bool);
    57 WK_EXPORT void WKBundleRemoveOriginAccessWhitelistEntry(WKBundleRef bundle, WKStringRef, WKStringRef, WKStringRef, bool);
    58 WK_EXPORT void WKBundleResetOriginAccessWhitelists(WKBundleRef bundle);
     56WK_EXPORT void WKBundleAddOriginAccessAllowListEntry(WKBundleRef bundle, WKStringRef, WKStringRef, WKStringRef, bool);
     57WK_EXPORT void WKBundleRemoveOriginAccessAllowListEntry(WKBundleRef bundle, WKStringRef, WKStringRef, WKStringRef, bool);
     58WK_EXPORT void WKBundleResetOriginAccessAllowLists(WKBundleRef bundle);
    5959WK_EXPORT int WKBundleNumberOfPages(WKBundleRef bundle, WKBundleFrameRef frameRef, double pageWidthInPixels, double pageHeightInPixels);
    6060WK_EXPORT int WKBundlePageNumberForElementById(WKBundleRef bundle, WKBundleFrameRef frameRef, WKStringRef idRef, double pageWidthInPixels, double pageHeightInPixels);

  • trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp

    r263700 r265081  
    397397}
    398398
    399 void InjectedBundle::addOriginAccessWhitelistEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains)
     399void InjectedBundle::addOriginAccessAllowListEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains)
    400400{
    401401    SecurityPolicy::addOriginAccessAllowlistEntry(SecurityOrigin::createFromString(sourceOrigin).get(), destinationProtocol, destinationHost, allowDestinationSubdomains);
    402     WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::AddOriginAccessWhitelistEntry { sourceOrigin, destinationProtocol, destinationHost, allowDestinationSubdomains }, 0);
    403 
    404 }
    405 
    406 void InjectedBundle::removeOriginAccessWhitelistEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains)
     402    WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::AddOriginAccessAllowListEntry { sourceOrigin, destinationProtocol, destinationHost, allowDestinationSubdomains }, 0);
     403
     404}
     405
     406void InjectedBundle::removeOriginAccessAllowListEntry(const String& sourceOrigin, const String& destinationProtocol, const String& destinationHost, bool allowDestinationSubdomains)
    407407{
    408408    SecurityPolicy::removeOriginAccessAllowlistEntry(SecurityOrigin::createFromString(sourceOrigin).get(), destinationProtocol, destinationHost, allowDestinationSubdomains);
    409     WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::RemoveOriginAccessWhitelistEntry { sourceOrigin, destinationProtocol, destinationHost, allowDestinationSubdomains }, 0);
    410 }
    411 
    412 void InjectedBundle::resetOriginAccessWhitelists()
     409    WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::RemoveOriginAccessAllowListEntry { sourceOrigin, destinationProtocol, destinationHost, allowDestinationSubdomains }, 0);
     410}
     411
     412void InjectedBundle::resetOriginAccessAllowLists()
    413413{
    414414    SecurityPolicy::resetOriginAccessAllowlists();
    415     WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::ResetOriginAccessWhitelists { }, 0);
     415    WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::ResetOriginAccessAllowLists { }, 0);
    416416}
    417417

  • trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.h

    r263275 r265081  
    108108    void setAuthorAndUserStylesEnabled(WebPageGroupProxy*, bool);
    109109    void setSpatialNavigationEnabled(WebPageGroupProxy*, bool);
    110     void addOriginAccessWhitelistEntry(const String&, const String&, const String&, bool);
    111     void removeOriginAccessWhitelistEntry(const String&, const String&, const String&, bool);
    112     void resetOriginAccessWhitelists();
     110    void addOriginAccessAllowListEntry(const String&, const String&, const String&, bool);
     111    void removeOriginAccessAllowListEntry(const String&, const String&, const String&, bool);
     112    void resetOriginAccessAllowLists();
    113113    void setAsynchronousSpellCheckingEnabled(WebPageGroupProxy*, bool);
    114114    int numberOfPages(WebFrame*, double, double);

  • trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

    r265072 r265081  
    246246
    247247#if PLATFORM(MAC)
    248     WebCore::FontCache::setFontAllowlist(parameters.fontWhitelist);
     248    WebCore::FontCache::setFontAllowlist(parameters.fontAllowList);
    249249#endif
    250250

  • trunk/Tools/ChangeLog

    r265080 r265081  
     12020-07-30  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove non-inclusive terminology from WebKit variable names and test-only SPI
     4        https://bugs.webkit.org/show_bug.cgi?id=214941
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
     9        (WTR::InjectedBundle::beginTesting):
     10        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
     11        (WTR::TestRunner::addOriginAccessWhitelistEntry):
     12        (WTR::TestRunner::removeOriginAccessWhitelistEntry):
     13
    1142020-07-15  Carlos Garcia Campos  <cgarcia@igalia.com>
    215

  • trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp

    r264867 r265081  
    629629    WKBundleClearAllDatabases(m_bundle);
    630630    WKBundlePageClearApplicationCache(page()->page());
    631     WKBundleResetOriginAccessWhitelists(m_bundle);
     631    WKBundleResetOriginAccessAllowLists(m_bundle);
    632632    WKBundleClearResourceLoadStatistics(m_bundle);
    633633

  • trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp

    r264609 r265081  
    574574void TestRunner::addOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
    575575{
    576     WKBundleAddOriginAccessWhitelistEntry(InjectedBundle::singleton().bundle(), toWK(sourceOrigin).get(), toWK(destinationProtocol).get(), toWK(destinationHost).get(), allowDestinationSubdomains);
     576    WKBundleAddOriginAccessAllowListEntry(InjectedBundle::singleton().bundle(), toWK(sourceOrigin).get(), toWK(destinationProtocol).get(), toWK(destinationHost).get(), allowDestinationSubdomains);
    577577}
    578578
    579579void TestRunner::removeOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef destinationProtocol, JSStringRef destinationHost, bool allowDestinationSubdomains)
    580580{
    581     WKBundleRemoveOriginAccessWhitelistEntry(InjectedBundle::singleton().bundle(), toWK(sourceOrigin).get(), toWK(destinationProtocol).get(), toWK(destinationHost).get(), allowDestinationSubdomains);
     581    WKBundleRemoveOriginAccessAllowListEntry(InjectedBundle::singleton().bundle(), toWK(sourceOrigin).get(), toWK(destinationProtocol).get(), toWK(destinationHost).get(), allowDestinationSubdomains);
    582582}
    583583
Note: See TracChangeset for help on using the changeset viewer.