Unified Diff: lib/filterComposer.js
Issue 29991594:
Issue 7243 - Update adblockpluscore dependency to hg:e26e122e0702 (Closed)
Base URL: https://hg.adblockplus.org/adblockpluschrome/
Patch Set:
Created Jan. 29, 2019, 4:36 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« lib/csp.js ('K')
|
« lib/devtools.js ('k')
|
lib/hitLogger.js » ('j')
|
qunit/tests/url.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: lib/filterComposer.js |
| =================================================================== |
| --- a/lib/filterComposer.js |
| +++ b/lib/filterComposer.js |
| @@ -17,18 +17,19 @@ |
| /** @module filterComposer */ |
| "use strict"; |
| const {defaultMatcher} = require("../adblockpluscore/lib/matcher"); |
| const {RegExpFilter} = require("../adblockpluscore/lib/filterClasses"); |
| const {filterNotifier} = require("../adblockpluscore/lib/filterNotifier"); |
| +const {isThirdParty} = require("../adblockpluscore/lib/domain"); |
| const {Prefs} = require("./prefs"); |
| -const {extractHostFromFrame, isThirdParty} = require("./url"); |
| +const {extractHostFromFrame} = require("./url"); |
| const {getKey, checkWhitelisted} = require("./whitelisting"); |
| const {port} = require("./messaging"); |
| const info = require("info"); |
| function isValidString(s) |
| { |
| return s && s.indexOf("\0") == -1; |
| } |
« lib/csp.js ('K')
|
« lib/devtools.js ('k')
|
lib/hitLogger.js » ('j')
|
qunit/tests/url.js » ('J')
