Unified Diff: lib/csp.js
Issue 29570614:
Issue 5028 - Use browser namespace (Closed)
Base URL: https://hg.adblockplus.org/adblockpluschrome/
Patch Set: Promisify
Created Oct. 11, 2017, 3:22 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« include.preload.js ('k')
|
lib/cssInjection.js » ('j')
|
polyfill.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: lib/csp.js |
| =================================================================== |
| --- a/lib/csp.js |
| +++ b/lib/csp.js |
| @@ -16,25 +16,25 @@ |
| */ |
| "use strict"; |
| // The webRequest API doesn't support WebSocket connection blocking in Microsoft |
| // Edge and versions of Chrome before 58. Therefore for those we inject CSP |
| // headers below as a workaround. See https://crbug.com/129353 and |
| // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/10297376/ |
| -if (!chrome.webRequest.ResourceType || |
| - !("WEBSOCKET" in chrome.webRequest.ResourceType)) |
| +if (!browser.webRequest.ResourceType || |
| + !("WEBSOCKET" in browser.webRequest.ResourceType)) |
| { |
| const {defaultMatcher} = require("matcher"); |
| const {BlockingFilter, RegExpFilter} = require("filterClasses"); |
| const {getDecodedHostname} = require("url"); |
| const {checkWhitelisted} = require("whitelisting"); |
| - chrome.webRequest.onHeadersReceived.addListener(details => |
| + browser.webRequest.onHeadersReceived.addListener(details => |
| { |
| let hostname = getDecodedHostname(new URL(details.url)); |
| let match = defaultMatcher.matchesAny("", RegExpFilter.typeMap.WEBSOCKET, |
| hostname, false, null, true); |
| if (match instanceof BlockingFilter && |
| !checkWhitelisted(new ext.Page({id: details.tabId}), |
| ext.getFrame(details.tabId, details.frameId))) |
| { |
« no previous file with comments
|
« include.preload.js ('k')
|
lib/cssInjection.js » ('j')
|
polyfill.js » ('J')
