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

Side by Side Diff: lib/whitelisting.js

Issue 29991594: Issue 7243 - Update adblockpluscore dependency to hg:e26e122e0702 (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/
Patch Set: Remove third-party checks from QUnit tests Created Jan. 31, 2019, 12:56 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « lib/url.js ('k') | metadata.chrome » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-present eyeo GmbH 3 * Copyright (C) 2006-present eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 /** @module whitelisting */ 18 /** @module whitelisting */
19 19
20 "use strict"; 20 "use strict";
21 21
22 const {defaultMatcher} = require("../adblockpluscore/lib/matcher"); 22 const {defaultMatcher} = require("../adblockpluscore/lib/matcher");
23 const {Filter, RegExpFilter} = require("../adblockpluscore/lib/filterClasses"); 23 const {Filter, RegExpFilter} = require("../adblockpluscore/lib/filterClasses");
24 const {filterNotifier} = require("../adblockpluscore/lib/filterNotifier"); 24 const {filterNotifier} = require("../adblockpluscore/lib/filterNotifier");
25 const {filterStorage} = require("../adblockpluscore/lib/filterStorage"); 25 const {filterStorage} = require("../adblockpluscore/lib/filterStorage");
26 const {extractHostFromFrame, isThirdParty} = require("./url"); 26 const {isThirdParty} = require("../adblockpluscore/lib/domain");
27 const {extractHostFromFrame} = require("./url");
27 const {port} = require("./messaging"); 28 const {port} = require("./messaging");
28 const {logWhitelistedDocument} = require("./hitLogger"); 29 const {logWhitelistedDocument} = require("./hitLogger");
29 const {verifySignature} = require("../adblockpluscore/lib/rsa"); 30 const {verifySignature} = require("../adblockpluscore/lib/rsa");
30 31
31 let sitekeys = new ext.PageMap(); 32 let sitekeys = new ext.PageMap();
32 33
33 function match(page, url, typeMask, docDomain, sitekey) 34 function match(page, url, typeMask, docDomain, sitekey)
34 { 35 {
35 let thirdParty = !!docDomain && isThirdParty(url, docDomain); 36 let thirdParty = !!docDomain && isThirdParty(url, docDomain);
36 37
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 { 235 {
235 browser.webRequest.onHeadersReceived.addListener( 236 browser.webRequest.onHeadersReceived.addListener(
236 onHeadersReceived, 237 onHeadersReceived,
237 { 238 {
238 urls: ["http://*/*", "https://*/*"], 239 urls: ["http://*/*", "https://*/*"],
239 types: ["main_frame", "sub_frame"] 240 types: ["main_frame", "sub_frame"]
240 }, 241 },
241 ["responseHeaders"] 242 ["responseHeaders"]
242 ); 243 );
243 } 244 }
OLDNEW
« no previous file with comments | « lib/url.js ('k') | metadata.chrome » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld