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

Side by Side Diff: lib/whitelisting.js

Issue 29375851: [safari] Issue 4902 - Partially revert d5be57b68f91 for Safari compatibility (Closed)
Patch Set: Created Feb. 17, 2017, 9:31 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/sha1.js ('k') | metadata.common » ('j') | metadata.common » ('J')
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-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 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 let {defaultMatcher} = require("matcher"); 22 let {defaultMatcher} = require("matcher");
23 let {RegExpFilter} = require("filterClasses"); 23 let {RegExpFilter} = require("filterClasses");
24 let {DownloadableSubscription} = require("subscriptionClasses"); 24 let {DownloadableSubscription} = require("subscriptionClasses");
25 let {FilterNotifier} = require("filterNotifier"); 25 let {FilterNotifier} = require("filterNotifier");
26 let {stringifyURL, getDecodedHostname, extractHostFromFrame, isThirdParty} = req uire("url"); 26 let {stringifyURL, getDecodedHostname, extractHostFromFrame, isThirdParty} = req uire("url");
27 let {port} = require("messaging"); 27 let {port} = require("messaging");
28 let devtools = require("devtools"); 28 let devtools = require("devtools");
29 let {verifySignature} = require("rsa");
30 29
31 let sitekeys = new ext.PageMap(); 30 let sitekeys = new ext.PageMap();
32 31
33 function match(page, url, typeMask, docDomain, sitekey) 32 function match(page, url, typeMask, docDomain, sitekey)
34 { 33 {
35 let thirdParty = !!docDomain && isThirdParty(url, docDomain); 34 let thirdParty = !!docDomain && isThirdParty(url, docDomain);
36 let urlString = stringifyURL(url); 35 let urlString = stringifyURL(url);
37 36
38 if (!docDomain) 37 if (!docDomain)
39 docDomain = getDecodedHostname(url); 38 docDomain = getDecodedHostname(url);
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 194
196 if (typeof chrome == "object") 195 if (typeof chrome == "object")
197 chrome.webRequest.onHeadersReceived.addListener( 196 chrome.webRequest.onHeadersReceived.addListener(
198 onHeadersReceived, 197 onHeadersReceived,
199 { 198 {
200 urls: ["http://*/*", "https://*/*"], 199 urls: ["http://*/*", "https://*/*"],
201 types: ["main_frame", "sub_frame"] 200 types: ["main_frame", "sub_frame"]
202 }, 201 },
203 ["responseHeaders"] 202 ["responseHeaders"]
204 ); 203 );
OLDNEW
« no previous file with comments | « lib/sha1.js ('k') | metadata.common » ('j') | metadata.common » ('J')

Powered by Google App Engine
This is Rietveld