Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: lib/filterComposer.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.
Jump to:
View side-by-side diff with in-line comments
Download patch
« lib/csp.js ('K') | « lib/devtools.js ('k') | lib/popupBlocker.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)
« lib/csp.js ('K') | « lib/devtools.js ('k') | lib/popupBlocker.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld