lib/requestBlocker.js - Issue 29991594: Issue 7243 - Update adblockpluscore dependency to hg:e26e122e0702

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: lib/requestBlocker.js

Issue 29991594: Issue 7243 - Update adblockpluscore dependency to hg:e26e122e0702 (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/

Patch Set: Compare CSP filters by text Created Jan. 31, 2019, 2:49 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

Index: lib/requestBlocker.js

===================================================================

--- a/lib/requestBlocker.js

+++ b/lib/requestBlocker.js

@@ -19,19 +19,20 @@

"use strict";

const {Filter, RegExpFilter, BlockingFilter} =

require("../adblockpluscore/lib/filterClasses");

const {Subscription} = require("../adblockpluscore/lib/subscriptionClasses");

const {defaultMatcher} = require("../adblockpluscore/lib/matcher");

const {filterNotifier} = require("../adblockpluscore/lib/filterNotifier");

+const {isThirdParty} = require("../adblockpluscore/lib/domain");

const {Prefs} = require("./prefs");

const {checkWhitelisted, getKey} = require("./whitelisting");

-const {extractHostFromFrame, isThirdParty} = require("./url");

+const {extractHostFromFrame} = require("./url");

const {port} = require("./messaging");

const {logRequest: hitLoggerLogRequest} = require("./hitLogger");

const extensionProtocol = new URL(browser.extension.getURL("")).protocol;

// Chrome can't distinguish between OBJECT_SUBREQUEST and OBJECT requests.

if (!browser.webRequest.ResourceType ||

!("OBJECT_SUBREQUEST" in browser.webRequest.ResourceType))

« no previous file with comments | « lib/publicSuffixList.js ('k') | lib/tldjs.js » ('j') | no next file with comments »