Index: lib/filterComposer.js |
=================================================================== |
--- a/lib/filterComposer.js |
+++ b/lib/filterComposer.js |
@@ -17,17 +17,16 @@ |
/** @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} = require("./url"); |
const {getKey, checkWhitelisted} = require("./whitelisting"); |
const {port} = require("./messaging"); |
const info = require("info"); |
function isValidString(s) |
{ |
@@ -88,18 +87,17 @@ |
let specificOnly = checkWhitelisted(page, frame, null, |
RegExpFilter.typeMap.GENERICBLOCK); |
// Add a blocking filter for each URL of the element that can be blocked |
for (let url of details.urls) |
{ |
let urlObj = new URL(url, details.baseURL); |
let whitelisted = defaultMatcher.isWhitelisted( |
- urlObj.href, typeMask, docDomain, |
- isThirdParty(urlObj, docDomain), |
+ urlObj, typeMask, docDomain, |
getKey(page, frame), specificOnly |
); |
if (!whitelisted) |
{ |
let filterText = urlObj.href.replace(/^[\w-]+:\/+(?:www\.)?/, "||"); |
if (specificOnly) |