Remove more non-inclusive language from Source

https://bugs.webkit.org/show_bug.cgi?id=229230

Patch by Alex Christensen <achristensen@webkit.org> on 2021-08-19
Reviewed by Myles C. Maxfield.

Source/WebCore:

No change in behavior.

* WebCore.order:
* features.json:

Source/WebInspectorUI:

* UserInterface/External/three.js/three.js:
(return.parseTrackName):
(parseTrackName):
* UserInterface/Views/ConsoleMessageView.js:
(WI.ConsoleMessageView.prototype._formatWithSubstitutionString.styleFormatter):
(WI.ConsoleMessageView.prototype._formatWithSubstitutionString.isAllowedProperty):
(WI.ConsoleMessageView.prototype._formatWithSubstitutionString.isWhitelistedProperty): Deleted.
* UserInterface/Views/DOMTreeElement.js:
(WI.DOMTreeElement.prototype.populateDOMNodeContextMenu):

Source/WebKit:

* mac/WebKit2.order:

Source/WebKitLegacy/mac:

* WebKit.order:
* WebView/WebViewPrivate.h:

Source/WTF:

* icu/unicode/uspoof.h:
This comment change comes from upstream ICU.
* wtf/URL.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281258 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 28793a59cef0afb94a3fb496c2d1e711e9d0ff55..20e296ed4c2127cc7d5585641195e7463f5cc9df 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,14 @@
+2021-08-19  Alex Christensen  <achristensen@webkit.org>
+
+        Remove more non-inclusive language from Source
+        https://bugs.webkit.org/show_bug.cgi?id=229230
+
+        Reviewed by Myles C. Maxfield.
+
+        * icu/unicode/uspoof.h:
+        This comment change comes from upstream ICU.
+        * wtf/URL.h:
+
 2021-08-18  Ryosuke Niwa  <rniwa@webkit.org>
 
         [ iOS Debug ] 12 TestWebKitAPI.WebKitLegacy. tests are crashing

diff --git a/Source/WTF/icu/unicode/uspoof.h b/Source/WTF/icu/unicode/uspoof.h
index 781a88247fe4c5be0b263fb8ac9ef8738b4d7831..51a202a3ce319bc4733016fa1302175839115c67 100644 (file)
--- a/Source/WTF/icu/unicode/uspoof.h
+++ b/Source/WTF/icu/unicode/uspoof.h
@@ -734,8 +734,9 @@ uspoof_clone(const USpoofChecker *sc, UErrorCode *status);
  * }
  * </pre>
  *
- * To disable specific checks and enable all others, the "blacklisted" checks should be ANDed away from
- * ALL_CHECKS. For example, if you are not planning to use the {@link uspoof_areConfusable} functionality,
+ * To disable specific checks and enable all others, 
+ * start with ALL_CHECKS and "AND away" the not-desired checks.
+ * For example, if you are not planning to use the {@link uspoof_areConfusable} functionality,
  * it is good practice to disable the CONFUSABLE check:
  *
  * <pre>

diff --git a/Source/WTF/wtf/URL.h b/Source/WTF/wtf/URL.h
index eda4117b49b43e13b0914919e3427671c57894ec..b1e9fdf161ceb69b682a53cd3b593214c61be379 100644 (file)
--- a/Source/WTF/wtf/URL.h
+++ b/Source/WTF/wtf/URL.h
@@ -262,7 +262,7 @@ WTF_EXPORT_PRIVATE bool protocolIsInHTTPFamily(StringView url);
 
 WTF_EXPORT_PRIVATE std::optional<uint16_t> defaultPortForProtocol(StringView protocol);
 WTF_EXPORT_PRIVATE bool isDefaultPortForProtocol(uint16_t port, StringView protocol);
-WTF_EXPORT_PRIVATE bool portAllowed(const URL&); // Blacklist ports that should never be used for Web resources.
+WTF_EXPORT_PRIVATE bool portAllowed(const URL&); // Disallow ports that should never be used for Web resources.
 
 WTF_EXPORT_PRIVATE void registerDefaultPortForProtocolForTesting(uint16_t port, const String& protocol);
 WTF_EXPORT_PRIVATE void clearDefaultPortForProtocolMapForTesting();

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 08e944baadf82ab9fbd37fdceab1e0bef6d04a92..964a0f3147f0f0a01cd7053eecfee88075aaaea8 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2021-08-19  Alex Christensen  <achristensen@webkit.org>
+
+        Remove more non-inclusive language from Source
+        https://bugs.webkit.org/show_bug.cgi?id=229230
+
+        Reviewed by Myles C. Maxfield.
+
+        No change in behavior.
+
+        * WebCore.order:
+        * features.json:
+
 2021-08-19  Simon Fraser  <simon.fraser@apple.com>
 
         Rename Element::clientRect() which does not return a value in web-exposed "client" coordinates

diff --git a/Source/WebCore/WebCore.order b/Source/WebCore/WebCore.order
index ef168b76819216d984b7a2d0f760005fb9d24de8..9f85e4986c53a1cc8d63b3394d3f7295832af387 100644 (file)
--- a/Source/WebCore/WebCore.order
+++ b/Source/WebCore/WebCore.order
@@ -1643,17 +1643,14 @@ __ZN7WebCore20ElementRuleCollector11ruleMatchesERKNS_8RuleDataEPKNS_13ContainerN
 __ZN7WebCore20ElementRuleCollector14addMatchedRuleEPKNS_8RuleDataE
 __ZN7WebCore20ElementRuleCollector27sortAndTransferMatchedRulesEv
 __ZNSt3__16__sortIRPFbPKN7WebCore8RuleDataES4_EPS4_EEvT0_S9_T_
-__ZN7WebCore13StyleResolver11MatchResult20addMatchedPropertiesEPKNS_16StylePropertySetEPNS_9StyleRuleEjNS_21PropertyWhitelistTypeE
 __ZN3WTF6RefPtrIN7WebCore16StylePropertySetEEaSEPS2_
 __ZN7WebCore20ElementRuleCollector13matchedResultEv
 __ZN7WebCore13StyleResolver22applyMatchedPropertiesERKNS0_11MatchResultEPKNS_7ElementE
 __ZN7WebCore13StyleResolver22applyMatchedPropertiesILNS0_20StyleApplicationPassE0EEEvRKNS0_11MatchResultEbiib
-__ZN7WebCore13StyleResolver15applyPropertiesILNS0_20StyleApplicationPassE0EEEvPKNS_16StylePropertySetEPNS_9StyleRuleEbbNS_21PropertyWhitelistTypeE
 __ZN7WebCore13StyleResolver13applyPropertyENS_13CSSPropertyIDEPNS_8CSSValueE
 __ZN7WebCore20ApplyPropertyDisplay10applyValueENS_13CSSPropertyIDEPNS_13StyleResolverEPNS_8CSSValueE
 __ZN7WebCore13StyleResolver10updateFontEv
 __ZN7WebCore13StyleResolver22applyMatchedPropertiesILNS0_20StyleApplicationPassE1EEEvRKNS0_11MatchResultEbiib
-__ZN7WebCore13StyleResolver15applyPropertiesILNS0_20StyleApplicationPassE1EEEvPKNS_16StylePropertySetEPNS_9StyleRuleEbbNS_21PropertyWhitelistTypeE
 __ZN7WebCore13StyleResolver17loadPendingImagesEv
 __ZN7WebCore13StyleResolver23loadPendingSVGDocumentsEv
 __ZN7WebCore13StyleResolver17adjustRenderStyleEPNS_11RenderStyleES2_PNS_7ElementE
@@ -3755,7 +3752,6 @@ __ZNK7WebCore8Document17formElementsStateEv
 __ZN7WebCore11HistoryItem16setDocumentStateERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEE
 __ZN7WebCore11HistoryItem14setScrollPointERKNS_8IntPointE
 __ZN7WebCore11HistoryItem18setPageScaleFactorEf
-__ZN7WebCore14SecurityPolicy19isAccessWhiteListedEPKNS_14SecurityOriginES3_
 __ZNK7WebCore14SecurityOrigin8toStringEv
 __ZN3WTF9HashTableIPN7WebCore26PageActivityAssertionTokenES3_NS_17IdentityExtractorENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES8_E16lookupForWritingINS_22IdentityHashTranslatorIS6_EES3_EENSt3__14pairIPS3_bEERKT0_
 __ZN7WebCore14ArchiveFactory17isArchiveMimeTypeERKN3WTF6StringE
@@ -8888,7 +8884,6 @@ __ZN3WTF6VectorIN7WebCore15FormDataElementELm0ENS_15CrashOnOverflowEE14expandCap
 __ZN3WTF6VectorIN7WebCore15FormDataElementELm0ENS_15CrashOnOverflowEE15reserveCapacityEm
 __ZN7WebCore15FormDataElementC2ERKS0_
 __ZN7WebCore32isSimpleCrossOriginAccessRequestERKN3WTF6StringERKNS_13HTTPHeaderMapE
-__ZN7WebCore45isOnAccessControlSimpleRequestHeaderWhitelistERKN3WTF6StringES3_
 __ZNK7WebCore8FormData8deepCopyEv
 __ZN7WebCore8FormDataD1Ev
 __ZN7WebCore8FormDataD2Ev
@@ -9543,7 +9538,6 @@ __ZNK7WebCore8FormData6encodeERN3WTF7EncoderE
 __ZN7WebCore8FormData6decodeERN3WTF7DecoderE
 __ZN7WebCore20ResourceHandleClient11didSendDataEPNS_14ResourceHandleEyy
 __ZN7WebCore24InspectorInstrumentation27didLoadXHRSynchronouslyImplEPNS_19InstrumentingAgentsE
-__ZN7WebCore40isOnAccessControlResponseHeaderWhitelistERKN3WTF6StringE
 __ZN7WebCore17HTMLAnchorElement9sendPingsERKNS_4KURLE
 __ZN7WebCore12EventHandler23handleMouseReleaseEventERKNS_28MouseEventWithHitTestResultsE
 __ZNK7WebCore20AutoscrollController20autoscrollInProgressEv
@@ -23703,7 +23697,6 @@ __ZTVN7WebCore31SearchFieldResultsButtonElementE
 __ZTVN7WebCore30SearchFieldCancelButtonElementE
 __ZTVN7WebCore12TextDocumentE
 __ZTVN7WebCore18TextDocumentParserE
-__ZN7WebCoreL25textEncodingNameBlacklistE
 __ZTVN7WebCore9TextEventE
 __ZTVN7WebCore18TextFieldInputTypeE
 __ZTVN7WebCore13TextInputTypeE
@@ -26349,7 +26342,6 @@ __ZN7WebCore18WebCoreMemoryTypes12JSHeapUnusedE
 __ZN7WebCore18WebCoreMemoryTypes14RenderTreeUsedE
 __ZN7WebCore18WebCoreMemoryTypes16RenderTreeUnusedE
 __ZN7WebCore18WebCoreMemoryTypes20ProcessPrivateMemoryE
-__ZL26IDNScriptWhiteListFileRead
 __ZTVN7WebCore5TimerINS_21WebGLRenderingContextEEE
 __ZTVN7WebCore41WebGLRenderingContextErrorMessageCallbackE
 __ZTVN7WebCore33WebGLRenderingContextLostCallbackE

diff --git a/Source/WebCore/features.json b/Source/WebCore/features.json
index 7c8840822c82ee0f46f72f48b2eaa69819f3076f..154186dbb71cfa1ef5eff2511dab0c9d121b452c 100644 (file)
--- a/Source/WebCore/features.json
+++ b/Source/WebCore/features.json
@@ -364,7 +364,7 @@
         "url": "https://w3c.github.io/webappsec-csp/2/",
         "keywords": ["csp", "cross-site scripting", "xss", "injection", "header", "security"],
         "category": "webapps",
-        "description": "A mechanism that web applications can use to mitigate content injection vulnerabilities, such as cross-site scripting (XSS). Developers can declare a CSP policy to prohibit their web application from loading content or executing scripts that have not been whitelisted among other capabilities.",
+        "description": "A mechanism that web applications can use to mitigate content injection vulnerabilities, such as cross-site scripting (XSS). Developers can declare a CSP policy to prohibit their web application from loading content or executing scripts that have not been allowed among other capabilities.",
         "contact": {
             "name": "Daniel Bates",
             "email": "dbates@webkit.org"

diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
index e74239532f869575f24227c9305ab28fb4ca748e..e6d05ca41e38948e12e4ceb4c8ce5e4e17335635 100644 (file)
--- a/Source/WebInspectorUI/ChangeLog
+++ b/Source/WebInspectorUI/ChangeLog
@@ -1,3 +1,20 @@
+2021-08-19  Alex Christensen  <achristensen@webkit.org>
+
+        Remove more non-inclusive language from Source
+        https://bugs.webkit.org/show_bug.cgi?id=229230
+
+        Reviewed by Myles C. Maxfield.
+
+        * UserInterface/External/three.js/three.js:
+        (return.parseTrackName):
+        (parseTrackName):
+        * UserInterface/Views/ConsoleMessageView.js:
+        (WI.ConsoleMessageView.prototype._formatWithSubstitutionString.styleFormatter):
+        (WI.ConsoleMessageView.prototype._formatWithSubstitutionString.isAllowedProperty):
+        (WI.ConsoleMessageView.prototype._formatWithSubstitutionString.isWhitelistedProperty): Deleted.
+        * UserInterface/Views/DOMTreeElement.js:
+        (WI.DOMTreeElement.prototype.populateDOMNodeContextMenu):
+
 2021-08-19  Tim Nguyen  <ntim@apple.com>
 
         Implement ::backdrop pseudo element

diff --git a/Source/WebInspectorUI/UserInterface/External/three.js/three.js b/Source/WebInspectorUI/UserInterface/External/three.js/three.js
index b133f6dfa285acf37269c37c7b1204a7ad7be97d..e804d424b6ad8aa5b5fd746061e3c293d507ff64 100644 (file)
--- a/Source/WebInspectorUI/UserInterface/External/three.js/three.js
+++ b/Source/WebInspectorUI/UserInterface/External/three.js/three.js
@@ -40450,7 +40450,7 @@
 
                     var objectName = results.nodeName.substring( lastDot + 1 );
 
-                    // Object names must be checked against a whitelist. Otherwise, there
+                    // Object names must be checked against a list. Otherwise, there
                     // is no way to parse 'foo.bar.baz': 'baz' must be a property, but
                     // 'bar' could be the objectName, or part of a nodeName (which can
                     // include '.' characters).

diff --git a/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js b/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js
index 827cf247111fbb18557c4b550ec01fbda12edc3f..5d1aad69287132e0d486c7c9da26c7349caa2beb 100644 (file)
--- a/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js
+++ b/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js
@@ -790,12 +790,12 @@ WI.ConsoleMessageView = class ConsoleMessageView extends WI.Object
             buffer.setAttribute("style", obj.description);
             for (var i = 0; i < buffer.style.length; i++) {
                 var property = buffer.style[i];
-                if (isWhitelistedProperty(property))
+                if (isAllowedProperty(property))
                     currentStyle[property] = buffer.style[property];
             }
         }
 
-        function isWhitelistedProperty(property)
+        function isAllowedProperty(property)
         {
             for (var prefix of ["background", "border", "color", "font", "line", "margin", "padding", "text"]) {
                 if (property.startsWith(prefix) || property.startsWith("-webkit-" + prefix))

diff --git a/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js b/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js
index 71b3a33ab7124c157f0793358b0a3b7df45cfd43..0da4a3d2f8601090939e7761cd205a616d7ba6b1 100644 (file)
--- a/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js
+++ b/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js
@@ -837,7 +837,7 @@ WI.DOMTreeElement = class DOMTreeElement extends WI.TreeElement
                 }, WI.isBeingEdited(attributeNode));
             }
 
-            if (InspectorBackend.hasCommand("DOM.setNodeName") && !DOMTreeElement.EditTagBlacklist.has(this.representedObject.nodeNameInCorrectCase())) {
+            if (InspectorBackend.hasCommand("DOM.setNodeName") && !DOMTreeElement.UneditableTagNames.has(this.representedObject.nodeNameInCorrectCase())) {
                 let tagNameNode = event.target.closest(".html-tag-name");
 
                 subMenus.edit.appendItem(WI.UIString("Tag", "A submenu item of 'Edit' to change DOM element's tag name"), () => {
@@ -1026,7 +1026,7 @@ WI.DOMTreeElement = class DOMTreeElement extends WI.TreeElement
         }
 
         var tagName = tagNameElement.textContent;
-        if (WI.DOMTreeElement.EditTagBlacklist.has(tagName.toLowerCase()))
+        if (WI.DOMTreeElement.UneditableTagNames.has(tagName.toLowerCase()))
             return false;
 
         if (WI.isBeingEdited(tagNameElement))
@@ -2094,7 +2094,7 @@ WI.DOMTreeElement.ForbiddenClosingTagElements = new Set([
 ]);
 
 // These tags we do not allow editing their tag name.
-WI.DOMTreeElement.EditTagBlacklist = new Set([
+WI.DOMTreeElement.UneditableTagNames = new Set([
     "html", "head", "body"
 ]);
 

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index c420c37475aaa22e5237ee6f553e6056de4dbd30..189735243eec7ad73b2331bf9c21e8b6fbf9136e 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2021-08-19  Alex Christensen  <achristensen@webkit.org>
+
+        Remove more non-inclusive language from Source
+        https://bugs.webkit.org/show_bug.cgi?id=229230
+
+        Reviewed by Myles C. Maxfield.
+
+        * mac/WebKit2.order:
+
 2021-08-19  Simon Fraser  <simon.fraser@apple.com>
 
         Rename Element::clientRect() which does not return a value in web-exposed "client" coordinates

diff --git a/Source/WebKit/mac/WebKit2.order b/Source/WebKit/mac/WebKit2.order
index eb5efa1536230897592c578b70157752b8be9a9b..c200e4f815d2a26bedda282fa16b02d7bbf8888a 100644 (file)
--- a/Source/WebKit/mac/WebKit2.order
+++ b/Source/WebKit/mac/WebKit2.order
@@ -1554,8 +1554,6 @@ __ZN6WebKit25InjectedBundleScriptWorld6createEv
 __ZN6WebKit25InjectedBundleScriptWorldC2EN3WTF10PassRefPtrIN7WebCore15DOMWrapperWorldEEE
 __ZN6WebKitL9allWorldsEv
 _WKBooleanGetTypeID
-_WKBundleAddOriginAccessWhitelistEntry
-__ZN6WebKit14InjectedBundle29addOriginAccessWhitelistEntryERKN3WTF6StringES4_S4_b
 __ZNK6WebKit14TypedAPIObjectILNS_9APIObject4TypeE81EE4typeEv
 _WKBundlePageGroupGetTypeID
 _WKBundleAddUserStyleSheet
@@ -3351,14 +3349,6 @@ __ZN6WebKit15PluginInfoStore10findPluginERN3WTF6StringERKN7WebCore4KURLENS4_10Pl
 __ZNK6WebKit15PluginInfoStore21findPluginForMIMETypeERKN3WTF6StringEN7WebCore10PluginData18AllowedPluginTypesE
 __ZN6WebKit15PluginInfoStore26defaultLoadPolicyForPluginERKNS_16PluginModuleInfoE
 _WKShouldBlockPlugin
-__ZN15PluginBlacklist17shouldBlockPluginEP8NSStringS1_
-____ZL30initializePluginBlacklistQueuev_block_invoke
-____ZN15PluginBlacklist17shouldBlockPluginEP8NSStringS1__block_invoke
-__ZL32reloadPluginBlacklistIfNecessaryv
-__ZN15PluginBlacklist6createEP8NSStringP11objc_object
-__ZN15PluginBlacklist14splitOSVersionEP8NSString
-__ZN15PluginBlacklistC2EP12NSDictionaryS1_P5NSSet
-__ZNK15PluginBlacklist11shouldBlockEP8NSStringS1_
 __ZN6WebKit33createPluginInformationDictionaryERKNS_16PluginModuleInfoERKN3WTF6StringES6_S6_S6_S6_b
 __ZN6WebKit26getPluginModuleInformationERKNS_16PluginModuleInfoERN3WTF7HashMapINS3_6StringENS3_6RefPtrINS_9APIObjectEEENS3_10StringHashENS3_10HashTraitsIS5_EENSA_IS8_EEEE
 __ZN6WebKit34getPlatformPluginModuleInformationERKNS_16PluginModuleInfoERN3WTF7HashMapINS3_6StringENS3_6RefPtrINS_9APIObjectEEENS3_10StringHashENS3_10HashTraitsIS5_EENSA_IS8_EEEE
@@ -3367,8 +3357,6 @@ __ZN6WebKit33pluginInformationBundleVersionKeyEv
 __ZN6WebKit38pluginInformationBundleShortVersionKeyEv
 __ZN6WebKit64pluginInformationUpdatePastLastBlockedVersionIsKnownAvailableKeyEv
 _WKIsPluginUpdateAvailable
-__ZN15PluginBlacklist23isPluginUpdateAvailableEP8NSString
-____ZN15PluginBlacklist23isPluginUpdateAvailableEP8NSString_block_invoke
 __ZN6WebKit37pluginInformationHasSandboxProfileKeyEv
 __ZN6WebKit23pluginHasSandboxProfileERKN3WTF6StringE
 __ZN6WebKitL24pluginSandboxProfileNameERKN3WTF6StringE
@@ -5159,7 +5147,6 @@ __ZN3WTF5DequeIN6WebKit19NativeWebWheelEventELm0EE11removeFirstEv
 _WKPageGroupRemoveAllUserStyleSheets
 __ZN6WebKit12WebPageGroup24removeAllUserStyleSheetsEv
 __ZN6WebKit12WebPageGroup25sendToAllProcessesInGroupIN8Messages17WebPageGroupProxy24RemoveAllUserStyleSheetsEEEvRKT_y
--[WKBrowsingContextGroup addUserStyleSheet:baseURL:whitelistedURLPatterns:blacklistedURLPatterns:mainFrameOnly:]
 __ZL13createWKArrayP7NSArray
 _WKPageGroupAddUserStyleSheet
 __ZN6WebKit12WebPageGroup17addUserStyleSheetERKN3WTF6StringES4_PNS_14ImmutableArrayES6_N7WebCore25UserContentInjectedFramesENS7_14UserStyleLevelE
@@ -5174,7 +5161,6 @@ __ZN6WebKit12WebPageGroup25sendToAllProcessesInGroupIN8Messages17WebPageGroupPro
 _WKPageGroupRemoveAllUserScripts
 __ZN6WebKit12WebPageGroup20removeAllUserScriptsEv
 __ZN6WebKit12WebPageGroup25sendToAllProcessesInGroupIN8Messages17WebPageGroupProxy20RemoveAllUserScriptsEEEvRKT_y
--[WKBrowsingContextGroup addUserScript:baseURL:whitelistedURLPatterns:blacklistedURLPatterns:injectionTime:mainFrameOnly:]
 _WKPageGroupAddUserScript
 __ZN6WebKit12WebPageGroup13addUserScriptERKN3WTF6StringES4_PNS_14ImmutableArrayES6_N7WebCore25UserContentInjectedFramesENS7_23UserScriptInjectionTimeE
 __ZN7WebCore10UserScriptC2ERKN3WTF6StringERKNS_4KURLERKNS1_6VectorIS2_Lm0ENS1_15CrashOnOverflowEEESC_NS_23UserScriptInjectionTimeENS_25UserContentInjectedFramesE
@@ -8306,8 +8292,6 @@ __ZN6WebKit10WebProcess10supplementINS_18WebDatabaseManagerEEEPT_v
 _WKBundleClearApplicationCache
 __ZN6WebKit14InjectedBundle21clearApplicationCacheEv
 __ZN6WebKit10WebProcess10supplementINS_26WebApplicationCacheManagerEEEPT_v
-_WKBundleResetOriginAccessWhitelists
-__ZN6WebKit14InjectedBundle27resetOriginAccessWhitelistsEv
 _WKURLResponseCopyURL
 _WKURLCopyHostName
 __ZNK6WebKit6WebURL4hostEv
@@ -9015,8 +8999,6 @@ __ZN6WebKit30InjectedBundlePageLoaderClient20didDetectXSSForFrameEPNS_7WebPageEP
 __ZN7CoreIPC13MessageSender4sendIN8Messages12WebPageProxy20DidDetectXSSForFrameEEEbRKT_y
 __ZN6WebKit12WebPageProxy20didDetectXSSForFrameEyRN7CoreIPC14MessageDecoderE
 __ZN6WebKit15WebLoaderClient20didDetectXSSForFrameEPNS_12WebPageProxyEPNS_13WebFrameProxyEPNS_9APIObjectE
-_WKBundleRemoveOriginAccessWhitelistEntry
-__ZN6WebKit14InjectedBundle32removeOriginAccessWhitelistEntryERKN3WTF6StringES4_S4_b
 __ZNK6WebKit23RemoteNetworkingContext12blockedErrorERKN7WebCore15ResourceRequestE
 __ZN7WebCore17FrameLoaderClient17didNotAllowScriptEv
 _WKAccessibilityFocusedObject

diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
index 7bf7e17c8ff87400fc60b9e6e5e720ebec7ea05a..897a94fb7172960886f4c1485c47b27b2eae6f18 100644 (file)
--- a/Source/WebKitLegacy/mac/ChangeLog
+++ b/Source/WebKitLegacy/mac/ChangeLog
@@ -1,3 +1,13 @@
+2021-08-19  Alex Christensen  <achristensen@webkit.org>
+
+        Remove more non-inclusive language from Source
+        https://bugs.webkit.org/show_bug.cgi?id=229230
+
+        Reviewed by Myles C. Maxfield.
+
+        * WebKit.order:
+        * WebView/WebViewPrivate.h:
+
 2021-08-19  Simon Fraser  <simon.fraser@apple.com>
 
         Rename Element::clientRect() which does not return a value in web-exposed "client" coordinates

diff --git a/Source/WebKitLegacy/mac/WebKit.order b/Source/WebKitLegacy/mac/WebKit.order
index a5a2e22c08d61b1ffb97ad10e9432f14e88c080a..51e6e3e9bcb648e0bbb6fa88494c9ecda871700b 100644 (file)
--- a/Source/WebKitLegacy/mac/WebKit.order
+++ b/Source/WebKitLegacy/mac/WebKit.order
@@ -525,7 +525,6 @@ _WKCGContextIsBitmapContext
 -[WebView currentNodeHighlight]
 -[WebClipView resetAdditionalClip]
 __Z14CallUIDelegateP7WebViewP13objc_selectorP11objc_object
-+[WebView(WebPrivate) _addOriginAccessWhitelistEntryWithSourceOrigin:destinationProtocol:destinationHost:allowDestinationSubdomains:]
 __ZN7WebCore14SecurityOriginD2Ev
 -[WebView initWithFrame:frameName:groupName:]
 -[WebView(WebPrivate) _initWithFrame:frameName:groupName:usesDocumentViews:]
@@ -1196,7 +1195,6 @@ _WKGetPreferredExtensionForMIMEType
 -[WebView(WebPrivate) setProhibitsMainFrameScrolling:]
 __ZN15WebChromeClient35selectItemWritingDirectionIsNaturalEv
 __ZN15WebChromeClient46selectItemAlignmentFollowsMenuWritingDirectionEv
-+[WebView(WebPrivate) _removeOriginAccessWhitelistEntryWithSourceOrigin:destinationProtocol:destinationHost:allowDestinationSubdomains:]
 -[WebSecurityOrigin initWithURL:]
 -[WebDatabaseManager deleteOrigin:]
 -[WebSecurityOrigin(WebInternal) _core]
@@ -1293,7 +1291,6 @@ _WKSetHTTPCookieAcceptPolicy
 +[WebView(WebPrivate) _removeAllUserContentFromGroup:]
 -[WebView(WebPrivate) setTracksRepaints:]
 +[WebView(WebPrivate) _setUsesTestModeFocusRingColor:]
-+[WebView(WebPrivate) _resetOriginAccessWhitelists]
 +[WebView(WebPrivate) _setAllowsRoundingHacks:]
 -[WebFrame(WebPrivate) _clearOpener]
 -[WebView(WebPendingPublic) setHistoryDelegate:]
@@ -1597,14 +1594,6 @@ _WKCGContextGetShouldSmoothFonts
 __ZN7WebCore15InspectorClient23overridesShowPaintRectsEv
 -[WebBasePluginPackage bundleVersion]
 _WKShouldBlockPlugin
-__ZN15PluginBlacklist17shouldBlockPluginEP8NSStringS1_
-____ZL30initializePluginBlacklistQueuev_block_invoke
-____ZN15PluginBlacklist17shouldBlockPluginEP8NSStringS1__block_invoke
-__ZL32reloadPluginBlacklistIfNecessaryv
-__ZN15PluginBlacklist6createEP8NSStringP11objc_object
-__ZN15PluginBlacklist14splitOSVersionEP8NSString
-__ZN15PluginBlacklistC2EP12NSDictionaryS1_P5NSSet
-__ZNK15PluginBlacklist11shouldBlockEP8NSStringS1_
 +[WebHostedNetscapePluginView initialize]
 -[WebBaseNetscapePluginView .cxx_construct]
 -[WebHostedNetscapePluginView .cxx_construct]
@@ -2339,7 +2328,6 @@ __Z14CallUIDelegateP7WebViewP13objc_selector
 -[WebView _zoomOut:isTextOnly:]
 -[WebView(WebPendingPublic) zoomPageIn:]
 -[WebView _zoomIn:isTextOnly:]
-+[WebView(WebPrivate) _addUserStyleSheetToGroup:world:source:url:whitelist:blacklist:injectedFrames:]
 __ZL14toStringVectorP7NSArray
 -[WebFrameView scrollToBeginningOfDocument:]
 -[WebFrameView _scrollToBeginningOfDocument]
@@ -2537,7 +2525,6 @@ __ZN3JSC8Bindings8Instance3putEPNS_8JSObjectEPNS_9ExecStateENS_12PropertyNameENS
 __XPCSetException
 _WKPCSetException
 __ZN6WebKit27NetscapePluginInstanceProxy18setGlobalExceptionERKN3WTF6StringE
-+[WebView(WebPrivate) _addUserScriptToGroup:world:source:url:whitelist:blacklist:injectionTime:injectedFrames:]
 __ZN7WebCore14PluginViewBase27privateBrowsingStateChangedEb
 -[WebHostedNetscapePluginView privateBrowsingModeDidChange]
 __ZN6WebKit27NetscapePluginInstanceProxy28privateBrowsingModeDidChangeEb

diff --git a/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h b/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h
index 2c53a6bb42f760d26951e93c6e87d3d0e7201674..4f272e38e0c59fc9813e50f506b04d4fcbd8dc70 100644 (file)
--- a/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h
+++ b/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h
@@ -797,10 +797,10 @@ Could be worth adding to the API.
 - (NSPasteboard *)_insertionPasteboard;
 #endif
 
-// Whitelists access from an origin (sourceOrigin) to a set of one or more origins described by the parameters:
+// Allow lists access from an origin (sourceOrigin) to a set of one or more origins described by the parameters:
 // - destinationProtocol: The protocol to grant access to.
 // - destinationHost: The host to grant access to.
-// - allowDestinationSubdomains: If host is a domain, setting this to YES will whitelist host and all its subdomains, recursively.
+// - allowDestinationSubdomains: If host is a domain, setting this to YES will allow host and all its subdomains, recursively.
 + (void)_addOriginAccessAllowListEntryWithSourceOrigin:(NSString *)sourceOrigin destinationProtocol:(NSString *)destinationProtocol destinationHost:(NSString *)destinationHost allowDestinationSubdomains:(BOOL)allowDestinationSubdomains;
 + (void)_removeOriginAccessAllowListEntryWithSourceOrigin:(NSString *)sourceOrigin destinationProtocol:(NSString *)destinationProtocol destinationHost:(NSString *)destinationHost allowDestinationSubdomains:(BOOL)allowDestinationSubdomains;