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

Side by Side Diff: lib/requestBlocker.js

Issue 29522656: Issue 5316 - Adds supported filter types export value to requestBlocker (Closed)
Patch Set: update dependency file Created Sept. 19, 2017, 1:45 p.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 | « dependencies ('k') | no next file » | 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
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 yield ["sub_frame", "SUBDOCUMENT"]; 46 yield ["sub_frame", "SUBDOCUMENT"];
47 47
48 // Treat navigator.sendBeacon() the same as <a ping>, it's essentially the 48 // Treat navigator.sendBeacon() the same as <a ping>, it's essentially the
49 // same concept - merely generalized. 49 // same concept - merely generalized.
50 yield ["beacon", "PING"]; 50 yield ["beacon", "PING"];
51 51
52 // Treat <img srcset> and <picture> the same as other images. 52 // Treat <img srcset> and <picture> the same as other images.
53 yield ["imageset", "IMAGE"]; 53 yield ["imageset", "IMAGE"];
54 }()); 54 }());
55 55
56 exports.filterTypes = new Set(function*()
57 {
58 // Microsoft Edge does not have webRequest.ResourceType or the devtools panel.
59 // Since filterTypes is only used by devtools, we can just bail out here.
60 if (!(chrome.webRequest.ResourceType))
61 return;
62
63 for (let type in chrome.webRequest.ResourceType)
64 yield resourceTypes.get(chrome.webRequest.ResourceType[type]) || "OTHER";
65
66 // WEBSOCKET and WEBRTC get addressed through workarounds, even if the
67 // webRequest API is lacking support to block these kind of requests.
68 yield "WEBSOCKET";
69 yield "WEBRTC";
70
71 // POPUP and ELEMHIDE filters aren't blocked on the request level but by other
72 // means. They don't have a corresponding value in webRequest.ResourceType.
73 yield "POPUP";
74 yield "ELEMHIDE";
75 }());
76
56 function onBeforeRequestAsync(page, url, type, docDomain, 77 function onBeforeRequestAsync(page, url, type, docDomain,
57 thirdParty, sitekey, 78 thirdParty, sitekey,
58 specificOnly, filter) 79 specificOnly, filter)
59 { 80 {
60 if (filter) 81 if (filter)
61 FilterNotifier.emit("filter.hitCount", filter, 0, 0, page); 82 FilterNotifier.emit("filter.hitCount", filter, 0, 0, page);
62 83
63 if (devtools) 84 if (devtools)
64 { 85 {
65 devtools.logRequest( 86 devtools.logRequest(
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 return false; 218 return false;
198 } 219 }
199 220
200 return ext.webRequest.onBeforeRequest._dispatch( 221 return ext.webRequest.onBeforeRequest._dispatch(
201 new URL(msg.url), 222 new URL(msg.url),
202 msg.requestType, 223 msg.requestType,
203 sender.page, 224 sender.page,
204 sender.frame 225 sender.frame
205 ).includes(false); 226 ).includes(false);
206 }); 227 });
OLDNEW
« no previous file with comments | « dependencies ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld