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

Side by Side Diff: lib/requestBlocker.js

Issue 29503587: Issue 5464 - Upgrade to new asynchronous version of abp2blocklist (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/
Patch Set: Don't wrap setContentBlocker call into another promise Created Aug. 16, 2017, 11:33 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
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-2017 eyeo GmbH 3 * Copyright (C) 2006-2017 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 // Patch RegExpFilter.typeMap with WEBRTC, because abp2blocklist needs it and
33 // our version of core doesn't support it yet. See issue #5464.
34 RegExpFilter.typeMap.WEBRTC = 256;
35
32 ext.webRequest.getIndistinguishableTypes().forEach(types => 36 ext.webRequest.getIndistinguishableTypes().forEach(types =>
33 { 37 {
34 for (let i = 1; i < types.length; i++) 38 for (let i = 1; i < types.length; i++)
35 RegExpFilter.typeMap[types[i]] = RegExpFilter.typeMap[types[0]]; 39 RegExpFilter.typeMap[types[i]] = RegExpFilter.typeMap[types[0]];
36 }); 40 });
37 41
38 function onBeforeRequestAsync(page, url, type, docDomain, 42 function onBeforeRequestAsync(page, url, type, docDomain,
39 thirdParty, sitekey, 43 thirdParty, sitekey,
40 specificOnly, filter) 44 specificOnly, filter)
41 { 45 {
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 161
158 port.on("request.websocket", function(msg, sender) 162 port.on("request.websocket", function(msg, sender)
159 { 163 {
160 return ext.webRequest.onBeforeRequest._dispatch( 164 return ext.webRequest.onBeforeRequest._dispatch(
161 new URL(msg.url), 165 new URL(msg.url),
162 "WEBSOCKET", 166 "WEBSOCKET",
163 sender.page, 167 sender.page,
164 sender.frame 168 sender.frame
165 ).indexOf(false) != -1; 169 ).indexOf(false) != -1;
166 }); 170 });
OLDNEW

Powered by Google App Engine
This is Rietveld