Unified Diff: lib/whitelisting.js
Issue 29998582:
Issue [TBD] - Update adblockpluscore dependency to [TBD]
Base URL: https://hg.adblockplus.org/adblockpluschrome/
Patch Set: Remove matchRequest
Created Feb. 5, 2019, 5:15 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« lib/csp.js ('K')
|
« lib/requestBlocker.js ('k')
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: lib/whitelisting.js |
| =================================================================== |
| --- a/lib/whitelisting.js |
| +++ b/lib/whitelisting.js |
| @@ -18,35 +18,29 @@ |
| /** @module whitelisting */ |
| "use strict"; |
| const {defaultMatcher} = require("../adblockpluscore/lib/matcher"); |
| const {Filter, RegExpFilter} = require("../adblockpluscore/lib/filterClasses"); |
| const {filterNotifier} = require("../adblockpluscore/lib/filterNotifier"); |
| const {filterStorage} = require("../adblockpluscore/lib/filterStorage"); |
| -const {isThirdParty} = require("../adblockpluscore/lib/domain"); |
| const {extractHostFromFrame} = require("./url"); |
| const {port} = require("./messaging"); |
| const {logWhitelistedDocument} = require("./hitLogger"); |
| const {verifySignature} = require("../adblockpluscore/lib/rsa"); |
| let sitekeys = new ext.PageMap(); |
| function match(page, url, typeMask, docDomain, sitekey) |
| { |
| - let thirdParty = !!docDomain && isThirdParty(url, docDomain); |
| - |
| if (!docDomain) |
| docDomain = url.hostname; |
| - let filter = defaultMatcher.matchesAny( |
| - url.href, typeMask, docDomain, thirdParty, sitekey |
| - ); |
| - |
| + let filter = defaultMatcher.matchesAny(url, typeMask, docDomain, sitekey); |
| if (filter && page) |
| logWhitelistedDocument(page.id, url.href, typeMask, docDomain, filter); |
| return filter; |
| } |
| let checkWhitelisted = |
| /** |
