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

Delta Between Two Patch Sets: lib/requestBlocker.js

Issue 29522656: Issue 5316 - Adds supported filter types export value to requestBlocker (Closed)
Left Patch Set: add commments Created Sept. 6, 2017, 1:02 p.m.
Right 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:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « dependencies ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
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*() 56 exports.filterTypes = new Set(function*()
57 { 57 {
58 // Microsoft Edge does not have webRequest.ResourceType or the devtools panel. 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. 59 // Since filterTypes is only used by devtools, we can just bail out here.
60 if (!(chrome.webRequest.ResourceType)) 60 if (!(chrome.webRequest.ResourceType))
61 return; 61 return;
62
62 for (let type in chrome.webRequest.ResourceType) 63 for (let type in chrome.webRequest.ResourceType)
Sebastian Noack 2017/09/06 18:06:48 The code looks a little squashed. Perhaps add a bl
Jon Sonesen 2017/09/07 08:10:04 Done.
63 yield resourceTypes.get(chrome.webRequest.ResourceType[type]) || "OTHER"; 64 yield resourceTypes.get(chrome.webRequest.ResourceType[type]) || "OTHER";
64 // WEBSOCKET and WEBRTC get addressed through workarounds, even if webRequest 65
Sebastian Noack 2017/09/06 18:06:48 Perhaps also add a blank line here?
Sebastian Noack 2017/09/06 18:06:48 "webrequest" => "the webRequest API"
Jon Sonesen 2017/09/07 08:10:04 Done.
65 // is lacking support to block these kind of requests. 66 // WEBSOCKET and WEBRTC get addressed through workarounds, even if the
67 // webRequest API is lacking support to block these kind of requests.
66 yield "WEBSOCKET"; 68 yield "WEBSOCKET";
67 yield "WEBRTC"; 69 yield "WEBRTC";
70
68 // POPUP and ELEMHIDE filters aren't blocked on the request level but by other 71 // POPUP and ELEMHIDE filters aren't blocked on the request level but by other
Sebastian Noack 2017/09/06 18:06:49 Perhaps also add a blank line here?
Jon Sonesen 2017/09/07 08:10:04 Done.
69 // means. They don't have a corresponding value in webRequest.ResourceType. 72 // means. They don't have a corresponding value in webRequest.ResourceType.
70 yield "POPUP"; 73 yield "POPUP";
71 yield "ELEMHIDE"; 74 yield "ELEMHIDE";
72 }()); 75 }());
73 76
74 function onBeforeRequestAsync(page, url, type, docDomain, 77 function onBeforeRequestAsync(page, url, type, docDomain,
75 thirdParty, sitekey, 78 thirdParty, sitekey,
76 specificOnly, filter) 79 specificOnly, filter)
77 { 80 {
78 if (filter) 81 if (filter)
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 return false; 218 return false;
216 } 219 }
217 220
218 return ext.webRequest.onBeforeRequest._dispatch( 221 return ext.webRequest.onBeforeRequest._dispatch(
219 new URL(msg.url), 222 new URL(msg.url),
220 msg.requestType, 223 msg.requestType,
221 sender.page, 224 sender.page,
222 sender.frame 225 sender.frame
223 ).includes(false); 226 ).includes(false);
224 }); 227 });
LEFTRIGHT
« dependencies ('k') | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld