OLD | NEW |
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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 FilterNotifier.on("filter.added", onFilterChange); | 172 FilterNotifier.on("filter.added", onFilterChange); |
173 FilterNotifier.on("filter.removed", onFilterChange); | 173 FilterNotifier.on("filter.removed", onFilterChange); |
174 FilterNotifier.on("filter.disabled", arg => onFilterChange(arg, true)); | 174 FilterNotifier.on("filter.disabled", arg => onFilterChange(arg, true)); |
175 FilterNotifier.on("load", onFilterChange); | 175 FilterNotifier.on("load", onFilterChange); |
176 | 176 |
177 port.on("request.blockedByWrapper", (msg, sender) => | 177 port.on("request.blockedByWrapper", (msg, sender) => |
178 { | 178 { |
179 // Chrome 58 onwards directly supports WebSocket blocking, so we can ignore | 179 // Chrome 58 onwards directly supports WebSocket blocking, so we can ignore |
180 // messages from the wrapper here (see https://crbug.com/129353). Hopefully | 180 // messages from the wrapper here (see https://crbug.com/129353). Hopefully |
181 // WebRTC will be supported soon too (see https://crbug.com/707683). | 181 // WebRTC will be supported soon too (see https://crbug.com/707683). |
182 if (msg.requestType in chrome.webRequest.ResourceType) | 182 if (msg.requestType.toUpperCase() in chrome.webRequest.ResourceType) |
183 return false; | 183 return false; |
184 | 184 |
185 return ext.webRequest.onBeforeRequest._dispatch( | 185 return ext.webRequest.onBeforeRequest._dispatch( |
186 new URL(msg.url), | 186 new URL(msg.url), |
187 msg.requestType, | 187 msg.requestType, |
188 sender.page, | 188 sender.page, |
189 sender.frame | 189 sender.frame |
190 ).includes(false); | 190 ).includes(false); |
191 }); | 191 }); |
OLD | NEW |