Diff
Modified: trunk/Source/WebCore/ChangeLog (262893 => 262894)
--- trunk/Source/WebCore/ChangeLog 2020-06-11 03:27:40 UTC (rev 262893)
+++ trunk/Source/WebCore/ChangeLog 2020-06-11 04:23:20 UTC (rev 262894)
@@ -1,3 +1,37 @@
+2020-06-10 Beth Dakin <bda...@apple.com>
+
+ Replace instances of blacklist in WebCore with blocklist
+ https://bugs.webkit.org/show_bug.cgi?id=213064
+
+ Reviewed by Tim Horton.
+
+ * dom/ExtensionStyleSheets.cpp:
+ (WebCore::ExtensionStyleSheets::updateInjectedStyleSheetCache const):
+ * page/Frame.cpp:
+ (WebCore::Frame::injectUserScriptImmediately):
+ * page/UserContentURLPattern.cpp:
+ (WebCore::UserContentURLPattern::matchesPatterns):
+ * page/UserContentURLPattern.h:
+ * page/UserScript.h:
+ (WebCore::UserScript::UserScript):
+ (WebCore::UserScript::blocklist const):
+ (WebCore::UserScript::encode const):
+ (WebCore::UserScript::decode):
+ (WebCore::UserScript::blacklist const): Deleted.
+ * page/UserStyleSheet.h:
+ (WebCore::UserStyleSheet::UserStyleSheet):
+ (WebCore::UserStyleSheet::blocklist const):
+ (WebCore::UserStyleSheet::blacklist const): Deleted.
+ * platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:
+ (WebCore::GraphicsContextGLOpenGL::GraphicsContextGLOpenGL):
+ (WebCore::GraphicsContextGLOpenGL::checkGPUStatus):
+ * platform/mac/PasteboardMac.mm:
+ (WebCore::cocoaTypeFromHTMLClipboardType):
+ * platform/text/TextEncodingRegistry.cpp:
+ (WebCore::pruneBlocklistedCodecs):
+ (WebCore::extendTextCodecMaps):
+ (WebCore::pruneBlacklistedCodecs): Deleted.
+
2020-06-10 Frank Yang <guowei_y...@apple.com>
Multiple SVG Filters Unexpectedly lightens image using linearRGB
Modified: trunk/Source/WebCore/dom/ExtensionStyleSheets.cpp (262893 => 262894)
--- trunk/Source/WebCore/dom/ExtensionStyleSheets.cpp 2020-06-11 03:27:40 UTC (rev 262893)
+++ trunk/Source/WebCore/dom/ExtensionStyleSheets.cpp 2020-06-11 04:23:20 UTC (rev 262894)
@@ -148,7 +148,7 @@
if (userStyleSheet.injectedFrames() == UserContentInjectedFrames::InjectInTopFrameOnly && m_document.ownerElement())
return;
- if (!UserContentURLPattern::matchesPatterns(m_document.url(), userStyleSheet.whitelist(), userStyleSheet.blacklist()))
+ if (!UserContentURLPattern::matchesPatterns(m_document.url(), userStyleSheet.whitelist(), userStyleSheet.blocklist()))
return;
addStyleSheet(userStyleSheet);
Modified: trunk/Source/WebCore/page/Frame.cpp (262893 => 262894)
--- trunk/Source/WebCore/page/Frame.cpp 2020-06-11 03:27:40 UTC (rev 262893)
+++ trunk/Source/WebCore/page/Frame.cpp 2020-06-11 04:23:20 UTC (rev 262894)
@@ -671,7 +671,7 @@
return;
if (script.injectedFrames() == UserContentInjectedFrames::InjectInTopFrameOnly && !isMainFrame())
return;
- if (!UserContentURLPattern::matchesPatterns(document->url(), script.whitelist(), script.blacklist()))
+ if (!UserContentURLPattern::matchesPatterns(document->url(), script.whitelist(), script.blocklist()))
return;
if (!m_script->shouldAllowUserAgentScripts(*document))
return;
Modified: trunk/Source/WebCore/page/UserContentURLPattern.cpp (262893 => 262894)
--- trunk/Source/WebCore/page/UserContentURLPattern.cpp 2020-06-11 03:27:40 UTC (rev 262893)
+++ trunk/Source/WebCore/page/UserContentURLPattern.cpp 2020-06-11 04:23:20 UTC (rev 262894)
@@ -32,9 +32,9 @@
namespace WebCore {
-bool UserContentURLPattern::matchesPatterns(const URL& url, const Vector<String>& whitelist, const Vector<String>& blacklist)
+bool UserContentURLPattern::matchesPatterns(const URL& url, const Vector<String>& whitelist, const Vector<String>& blocklist)
{
- // In order for a URL to be a match it has to be present in the whitelist and not present in the blacklist.
+ // In order for a URL to be a match it has to be present in the whitelist and not present in the blocklist.
// If there is no whitelist at all, then all URLs are assumed to be in the whitelist.
bool matchesWhitelist = whitelist.isEmpty();
if (!matchesWhitelist) {
@@ -47,18 +47,18 @@
}
}
- bool matchesBlacklist = false;
- if (!blacklist.isEmpty()) {
- for (auto& entry : blacklist) {
+ bool matchesBlocklist = false;
+ if (!blocklist.isEmpty()) {
+ for (auto& entry : blocklist) {
UserContentURLPattern contentPattern(entry);
if (contentPattern.matches(url)) {
- matchesBlacklist = true;
+ matchesBlocklist = true;
break;
}
}
}
- return matchesWhitelist && !matchesBlacklist;
+ return matchesWhitelist && !matchesBlocklist;
}
bool UserContentURLPattern::parse(const String& pattern)
Modified: trunk/Source/WebCore/page/UserContentURLPattern.h (262893 => 262894)
--- trunk/Source/WebCore/page/UserContentURLPattern.h 2020-06-11 03:27:40 UTC (rev 262893)
+++ trunk/Source/WebCore/page/UserContentURLPattern.h 2020-06-11 04:23:20 UTC (rev 262894)
@@ -50,7 +50,7 @@
bool matchSubdomains() const { return m_matchSubdomains; }
- static bool matchesPatterns(const URL&, const Vector<String>& whitelist, const Vector<String>& blacklist);
+ static bool matchesPatterns(const URL&, const Vector<String>& whitelist, const Vector<String>& blocklist);
private:
WEBCORE_EXPORT bool parse(const String& pattern);
Modified: trunk/Source/WebCore/page/UserScript.h (262893 => 262894)
--- trunk/Source/WebCore/page/UserScript.h 2020-06-11 03:27:40 UTC (rev 262893)
+++ trunk/Source/WebCore/page/UserScript.h 2020-06-11 04:23:20 UTC (rev 262894)
@@ -41,11 +41,11 @@
UserScript& operator=(const UserScript&) = default;
UserScript& operator=(UserScript&&) = default;
- UserScript(String&& source, URL&& url, Vector<String>&& whitelist, Vector<String>&& blacklist, UserScriptInjectionTime injectionTime, UserContentInjectedFrames injectedFrames, WaitForNotificationBeforeInjecting waitForNotification)
+ UserScript(String&& source, URL&& url, Vector<String>&& whitelist, Vector<String>&& blocklist, UserScriptInjectionTime injectionTime, UserContentInjectedFrames injectedFrames, WaitForNotificationBeforeInjecting waitForNotification)
: m_source(WTFMove(source))
, m_url(WTFMove(url))
, m_whitelist(WTFMove(whitelist))
- , m_blacklist(WTFMove(blacklist))
+ , m_blocklist(WTFMove(blocklist))
, m_injectionTime(injectionTime)
, m_injectedFrames(injectedFrames)
, m_waitForNotificationBeforeInjecting(waitForNotification)
@@ -55,7 +55,7 @@
const String& source() const { return m_source; }
const URL& url() const { return m_url; }
const Vector<String>& whitelist() const { return m_whitelist; }
- const Vector<String>& blacklist() const { return m_blacklist; }
+ const Vector<String>& blocklist() const { return m_blocklist; }
UserScriptInjectionTime injectionTime() const { return m_injectionTime; }
UserContentInjectedFrames injectedFrames() const { return m_injectedFrames; }
WaitForNotificationBeforeInjecting waitForNotificationBeforeInjecting() const { return m_waitForNotificationBeforeInjecting; }
@@ -67,7 +67,7 @@
String m_source;
URL m_url;
Vector<String> m_whitelist;
- Vector<String> m_blacklist;
+ Vector<String> m_blocklist;
UserScriptInjectionTime m_injectionTime { UserScriptInjectionTime::DocumentStart };
UserContentInjectedFrames m_injectedFrames { UserContentInjectedFrames::InjectInAllFrames };
WaitForNotificationBeforeInjecting m_waitForNotificationBeforeInjecting { WaitForNotificationBeforeInjecting::No };
@@ -79,7 +79,7 @@
encoder << m_source;
encoder << m_url;
encoder << m_whitelist;
- encoder << m_blacklist;
+ encoder << m_blocklist;
encoder << m_injectionTime;
encoder << m_injectedFrames;
encoder << m_waitForNotificationBeforeInjecting;
@@ -103,9 +103,9 @@
if (!whitelist)
return WTF::nullopt;
- Optional<Vector<String>> blacklist;
- decoder >> blacklist;
- if (!blacklist)
+ Optional<Vector<String>> blocklist;
+ decoder >> blocklist;
+ if (!blocklist)
return WTF::nullopt;
Optional<UserScriptInjectionTime> injectionTime;
@@ -127,7 +127,7 @@
WTFMove(*source),
WTFMove(*url),
WTFMove(*whitelist),
- WTFMove(*blacklist),
+ WTFMove(*blocklist),
WTFMove(*injectionTime),
WTFMove(*injectedFrames),
WTFMove(*waitForNotification)
Modified: trunk/Source/WebCore/page/UserStyleSheet.h (262893 => 262894)
--- trunk/Source/WebCore/page/UserStyleSheet.h 2020-06-11 03:27:40 UTC (rev 262893)
+++ trunk/Source/WebCore/page/UserStyleSheet.h 2020-06-11 04:23:20 UTC (rev 262894)
@@ -43,11 +43,11 @@
{
}
- UserStyleSheet(const String& source, const URL& url, Vector<String>&& whitelist, Vector<String>&& blacklist, UserContentInjectedFrames injectedFrames, UserStyleLevel level, Optional<PageIdentifier> pageID = WTF::nullopt)
+ UserStyleSheet(const String& source, const URL& url, Vector<String>&& whitelist, Vector<String>&& blocklist, UserContentInjectedFrames injectedFrames, UserStyleLevel level, Optional<PageIdentifier> pageID = WTF::nullopt)
: m_source(source)
, m_url(url)
, m_whitelist(WTFMove(whitelist))
- , m_blacklist(WTFMove(blacklist))
+ , m_blocklist(WTFMove(blocklist))
, m_injectedFrames(injectedFrames)
, m_level(level)
, m_pageID(pageID)
@@ -57,7 +57,7 @@
const String& source() const { return m_source; }
const URL& url() const { return m_url; }
const Vector<String>& whitelist() const { return m_whitelist; }
- const Vector<String>& blacklist() const { return m_blacklist; }
+ const Vector<String>& blocklist() const { return m_blocklist; }
UserContentInjectedFrames injectedFrames() const { return m_injectedFrames; }
UserStyleLevel level() const { return m_level; }
Optional<PageIdentifier> pageID() const { return m_pageID; }
@@ -66,7 +66,7 @@
String m_source;
URL m_url;
Vector<String> m_whitelist;
- Vector<String> m_blacklist;
+ Vector<String> m_blocklist;
UserContentInjectedFrames m_injectedFrames;
UserStyleLevel m_level;
Optional<PageIdentifier> m_pageID;
Modified: trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm (262893 => 262894)
--- trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm 2020-06-11 03:27:40 UTC (rev 262893)
+++ trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm 2020-06-11 04:23:20 UTC (rev 262894)
@@ -268,8 +268,8 @@
CGLContextObj sharedCGLContext = sharedContext ? static_cast<CGLContextObj>(sharedContext->m_contextObj) : nullptr;
CGLError err = CGLCreateContext(pixelFormatObj, sharedCGLContext, &cglContext);
- GLint abortOnBlacklist = 0;
- CGLSetParameter(cglContext, kCGLCPAbortOnGPURestartStatusBlacklisted, &abortOnBlacklist);
+ GLint abortOnBlocklist = 0;
+ CGLSetParameter(cglContext, kCGLCPAbortOnGPURestartStatusBlacklisted, &abortOnBlocklist);
#if PLATFORM(MAC) // FIXME: This probably should be USE(OPENGL) - see <rdar://53062794>.
@@ -676,7 +676,7 @@
CGLContextObj cglContext = static_cast<CGLContextObj>(platformGraphicsContextGL());
CGLGetParameter(cglContext, kCGLCPGPURestartStatus, &restartStatus);
if (restartStatus == kCGLCPGPURestartStatusBlacklisted) {
- LOG(WebGL, "The GPU has blacklisted us (%p). Terminating.", this);
+ LOG(WebGL, "The GPU has blocklisted us (%p). Terminating.", this);
exit(EX_OSERR);
}
if (restartStatus == kCGLCPGPURestartStatusCaused) {
@@ -688,7 +688,7 @@
EAGLContext* currentContext = static_cast<EAGLContext*>(PlatformGraphicsContextGL());
[currentContext getParameter:kEAGLCPGPURestartStatus to:&restartStatus];
if (restartStatus == kEAGLCPGPURestartStatusCaused || restartStatus == kEAGLCPGPURestartStatusBlacklisted) {
- LOG(WebGL, "The GPU has either reset or blacklisted us (%p). Lose the context.", this);
+ LOG(WebGL, "The GPU has either reset or blocklisted us (%p). Lose the context.", this);
forceContextLost();
[EAGLContext setCurrentContext:0];
}
Modified: trunk/Source/WebCore/platform/mac/PasteboardMac.mm (262893 => 262894)
--- trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2020-06-11 03:27:40 UTC (rev 262893)
+++ trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2020-06-11 04:23:20 UTC (rev 262894)
@@ -567,7 +567,7 @@
return platformType;
}
- // Blacklist types that might contain subframe information.
+ // Blocklist types that might contain subframe information.
if (type == "text/rtf" || type == "public.rtf" || type == "com.apple.traditional-mac-plain-text")
return String();
Modified: trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp (262893 => 262894)
--- trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp 2020-06-11 03:27:40 UTC (rev 262893)
+++ trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp 2020-06-11 04:23:20 UTC (rev 262894)
@@ -97,7 +97,7 @@
static HashSet<const char*>* japaneseEncodings;
static HashSet<const char*>* nonBackslashEncodings;
-static const char* const textEncodingNameBlacklist[] = { "UTF-7", "BOCU-1", "SCSU" };
+static const char* const textEncodingNameBlocklist[] = { "UTF-7", "BOCU-1", "SCSU" };
static bool isUndesiredAlias(const char* alias)
{
@@ -135,10 +135,10 @@
textCodecMap->add(atomName, WTFMove(function));
}
-static void pruneBlacklistedCodecs()
+static void pruneBlocklistedCodecs()
{
- for (auto& nameFromBlacklist : textEncodingNameBlacklist) {
- auto* atomName = textEncodingNameMap->get(nameFromBlacklist);
+ for (auto& nameFromBlocklist : textEncodingNameBlocklist) {
+ auto* atomName = textEncodingNameMap->get(nameFromBlocklist);
if (!atomName)
continue;
@@ -237,7 +237,7 @@
TextCodecICU::registerEncodingNames(addToTextEncodingNameMap);
TextCodecICU::registerCodecs(addToTextCodecMap);
- pruneBlacklistedCodecs();
+ pruneBlocklistedCodecs();
buildQuirksSets();
}
Modified: trunk/Source/WebKit/ChangeLog (262893 => 262894)
--- trunk/Source/WebKit/ChangeLog 2020-06-11 03:27:40 UTC (rev 262893)
+++ trunk/Source/WebKit/ChangeLog 2020-06-11 04:23:20 UTC (rev 262894)
@@ -1,3 +1,14 @@
+2020-06-10 Beth Dakin <bda...@apple.com>
+
+ Replace instances of blacklist in WebCore with blocklist
+ https://bugs.webkit.org/show_bug.cgi?id=213064
+
+ Reviewed by Tim Horton.
+
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<UserStyleSheet>::encode):
+ (IPC::ArgumentCoder<UserStyleSheet>::decode):
+
2020-06-10 Wenson Hsieh <wenson_hs...@apple.com>
[iOS] editing/pasteboard/dom-paste tests consistently time out
Modified: trunk/Source/WebKit/Shared/WebCoreArgumentCoders.cpp (262893 => 262894)
--- trunk/Source/WebKit/Shared/WebCoreArgumentCoders.cpp 2020-06-11 03:27:40 UTC (rev 262893)
+++ trunk/Source/WebKit/Shared/WebCoreArgumentCoders.cpp 2020-06-11 04:23:20 UTC (rev 262894)
@@ -2081,7 +2081,7 @@
encoder << userStyleSheet.source();
encoder << userStyleSheet.url();
encoder << userStyleSheet.whitelist();
- encoder << userStyleSheet.blacklist();
+ encoder << userStyleSheet.blocklist();
encoder.encodeEnum(userStyleSheet.injectedFrames());
encoder.encodeEnum(userStyleSheet.level());
encoder << userStyleSheet.pageID();
@@ -2101,8 +2101,8 @@
if (!decoder.decode(whitelist))
return false;
- Vector<String> blacklist;
- if (!decoder.decode(blacklist))
+ Vector<String> blocklist;
+ if (!decoder.decode(blocklist))
return false;
UserContentInjectedFrames injectedFrames;
@@ -2118,7 +2118,7 @@
if (!pageID)
return false;
- userStyleSheet = UserStyleSheet(source, url, WTFMove(whitelist), WTFMove(blacklist), injectedFrames, level, WTFMove(*pageID));
+ userStyleSheet = UserStyleSheet(source, url, WTFMove(whitelist), WTFMove(blocklist), injectedFrames, level, WTFMove(*pageID));
return true;
}
