Left: | ||
Right: |
LEFT | RIGHT |
---|---|
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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
145 | 145 |
146 FilterNotifier.on("subscription.added", onFilterChange); | 146 FilterNotifier.on("subscription.added", onFilterChange); |
147 FilterNotifier.on("subscription.removed", onFilterChange); | 147 FilterNotifier.on("subscription.removed", onFilterChange); |
148 FilterNotifier.on("subscription.updated", onFilterChange); | 148 FilterNotifier.on("subscription.updated", onFilterChange); |
149 FilterNotifier.on("subscription.disabled", arg => onFilterChange(arg, true)); | 149 FilterNotifier.on("subscription.disabled", arg => onFilterChange(arg, true)); |
150 FilterNotifier.on("filter.added", onFilterChange); | 150 FilterNotifier.on("filter.added", onFilterChange); |
151 FilterNotifier.on("filter.removed", onFilterChange); | 151 FilterNotifier.on("filter.removed", onFilterChange); |
152 FilterNotifier.on("filter.disabled", arg => onFilterChange(arg, true)); | 152 FilterNotifier.on("filter.disabled", arg => onFilterChange(arg, true)); |
153 FilterNotifier.on("load", onFilterChange); | 153 FilterNotifier.on("load", onFilterChange); |
154 | 154 |
155 // Before Chrome 58, the webRequest API didn't intercept WebSocket connections, | |
156 // (see https://crbug.com/129353). Hence we patched the WebSocket object as a | |
157 // workaround. WebSocket connections detected by this workaround are handled | |
158 // below. | |
155 if (!("WEBSOCKET" in chrome.webRequest.ResourceType)) | 159 if (!("WEBSOCKET" in chrome.webRequest.ResourceType)) |
kzar
2017/03/28 05:38:13
Again please leave a comment here explaining that
Jon Sonesen
2017/03/28 13:03:14
No problem
| |
156 { | 160 { |
157 port.on("request.websocket", (msg, sender) => | 161 port.on("request.websocket", (msg, sender) => |
158 { | 162 { |
159 return ext.webRequest.onBeforeRequest._dispatch( | 163 return ext.webRequest.onBeforeRequest._dispatch( |
160 new URL(msg.url), | 164 new URL(msg.url), |
161 "WEBSOCKET", | 165 "WEBSOCKET", |
162 sender.page, | 166 sender.page, |
163 sender.frame | 167 sender.frame |
164 ).indexOf(false) != -1; | 168 ).indexOf(false) != -1; |
165 }); | 169 }); |
166 } | 170 } |
LEFT | RIGHT |