WebKit Bugzilla
New
Browse
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
RESOLVED FIXED
213064
Replace instances of blacklist in WebCore with blocklist
https://bugs.webkit.org/show_bug.cgi?id=213064
Summary
Replace instances of blacklist in WebCore with blocklist
Beth Dakin
Reported
2020-06-10 20:42:06 PDT
Continue the work started in
https://bugs.webkit.org/show_bug.cgi?id=213000
to replace instances of "blacklist" in WebCore with "blocklist".
Attachments
Patch
(16.61 KB, patch)
2020-06-10 20:44 PDT
,
Beth Dakin
no flags
Details
Formatted Diff
Diff
View All
Add attachment
proposed patch, testcase, etc.
Beth Dakin
Comment 1
2020-06-10 20:44:00 PDT
Created
attachment 401616
[details]
Patch
Tim Horton
Comment 2
2020-06-10 21:00:47 PDT
Comment on
attachment 401616
[details]
Patch View in context:
https://bugs.webkit.org/attachment.cgi?id=401616&action=review
> Source/WebCore/page/UserContentURLPattern.cpp:37 > + // In order for a URL to be a match it has to be present in the whitelist and not present in the blocklist.
You missed a "whitelist"
> Source/WebCore/page/UserContentURLPattern.cpp:61 > + return matchesWhitelist && !matchesBlocklist;
and here
Beth Dakin
Comment 3
2020-06-10 21:02:58 PDT
(In reply to Tim Horton from
comment #2
)
> Comment on
attachment 401616
[details]
> Patch > > View in context: >
https://bugs.webkit.org/attachment.cgi?id=401616&action=review
> > > Source/WebCore/page/UserContentURLPattern.cpp:37 > > + // In order for a URL to be a match it has to be present in the whitelist and not present in the blocklist. > > You missed a "whitelist" > > > Source/WebCore/page/UserContentURLPattern.cpp:61 > > + return matchesWhitelist && !matchesBlocklist; > > and here
Oh I missed ALL of whitelists! I thought I'd do a second patch just to keep the patches smaller, but it's an arbitrary division.
EWS
Comment 4
2020-06-10 21:23:25 PDT
Committed
r262894
: <
https://trac.webkit.org/changeset/262894
> All reviewed patches have been landed. Closing bug and clearing flags on
attachment 401616
[details]
.
Radar WebKit Bug Importer
Comment 5
2020-06-10 21:24:17 PDT
<
rdar://problem/64238706
>
Sam Weinig
Comment 6
2020-06-11 11:49:02 PDT
Comment on
attachment 401616
[details]
Patch View in context:
https://bugs.webkit.org/attachment.cgi?id=401616&action=review
> Source/WebCore/page/UserStyleSheet.h:60 > const Vector<String>& whitelist() const { return m_whitelist; } > - const Vector<String>& blacklist() const { return m_blacklist; } > + const Vector<String>& blocklist() const { return m_blocklist; }
I think we should match the naming elsewhere, and rename these to includeMatchPatternStrings/excludeMatchPatternStrings. This has the added benefit of actually explaining what these do. Alternatively, we could use the terms the developer.apple.com uses (
https://developer.apple.com/documentation/safariservices/safari_app_extensions/safari_app_extension_info_property_list_keys/about_content_script_and_style_sheet_keys
), allowedURLPatterns/excludedURLPatterns. Either way, we should use the same terminology for both UserStyleSheet and UserScript.
> Source/WebCore/platform/mac/PasteboardMac.mm:570 > - // Blacklist types that might contain subframe information. > + // Blocklist types that might contain subframe information.
This sentence no longer makes sense. I would replace Blocklist with "Reject"
Note
You need to
log in
before you can comment on or make changes to this bug.
Top of Page
Format For Printing
XML
Clone This Bug