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

Side by Side Diff: lib/requestBlocker.js

Issue 29367316: Issue 4722 - Drop support for Chrome 41 - 48 (Closed)
Patch Set: Removed getIndistinguishableTypes function Created Dec. 16, 2016, 9:37 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/polyfills/fetch.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-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
(...skipping 11 matching lines...) Expand all
22 let {Filter, RegExpFilter, BlockingFilter} = require("filterClasses"); 22 let {Filter, RegExpFilter, BlockingFilter} = require("filterClasses");
23 let {Subscription} = require("subscriptionClasses"); 23 let {Subscription} = require("subscriptionClasses");
24 let {defaultMatcher} = require("matcher"); 24 let {defaultMatcher} = require("matcher");
25 let {FilterNotifier} = require("filterNotifier"); 25 let {FilterNotifier} = require("filterNotifier");
26 let {Prefs} = require("prefs"); 26 let {Prefs} = require("prefs");
27 let {checkWhitelisted, getKey} = require("whitelisting"); 27 let {checkWhitelisted, getKey} = require("whitelisting");
28 let {stringifyURL, extractHostFromFrame, isThirdParty} = require("url"); 28 let {stringifyURL, extractHostFromFrame, isThirdParty} = require("url");
29 let {port} = require("messaging"); 29 let {port} = require("messaging");
30 let devtools = require("devtools"); 30 let devtools = require("devtools");
31 31
32 ext.webRequest.getIndistinguishableTypes().forEach(types => 32 // Chrome can not distinguish between OBJECT_SUBREQUEST and OBJECT requests.
Wladimir Palant 2016/12/16 10:06:15 Nit: I learned that it is "cannot" in English ;)
kzar 2016/12/16 10:27:34 Heh good point, well even better I went for "can't
33 { 33 RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT;
34 for (let i = 1; i < types.length; i++)
35 RegExpFilter.typeMap[types[i]] = RegExpFilter.typeMap[types[0]];
36 });
37 34
38 function onBeforeRequestAsync(page, url, type, docDomain, 35 function onBeforeRequestAsync(page, url, type, docDomain,
39 thirdParty, sitekey, 36 thirdParty, sitekey,
40 specificOnly, filter) 37 specificOnly, filter)
41 { 38 {
42 if (filter) 39 if (filter)
43 FilterNotifier.emit("filter.hitCount", filter, 0, 0, page); 40 FilterNotifier.emit("filter.hitCount", filter, 0, 0, page);
44 41
45 if (devtools) 42 if (devtools)
46 devtools.logRequest( 43 devtools.logRequest(
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 154
158 port.on("request.websocket", function(msg, sender) 155 port.on("request.websocket", function(msg, sender)
159 { 156 {
160 return ext.webRequest.onBeforeRequest._dispatch( 157 return ext.webRequest.onBeforeRequest._dispatch(
161 new URL(msg.url), 158 new URL(msg.url),
162 "WEBSOCKET", 159 "WEBSOCKET",
163 sender.page, 160 sender.page,
164 sender.frame 161 sender.frame
165 ).indexOf(false) != -1; 162 ).indexOf(false) != -1;
166 }); 163 });
OLDNEW
« no previous file with comments | « lib/polyfills/fetch.js ('k') | metadata.chrome » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld