| 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-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 | 
|   11  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the |   11  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 
|   12  * GNU General Public License for more details. |   12  * GNU General Public License for more details. | 
|   13  * |   13  * | 
|   14  * You should have received a copy of the GNU General Public License |   14  * You should have received a copy of the GNU General Public License | 
|   15  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>. |   15  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>. | 
|   16  */ |   16  */ | 
|   17  |   17  | 
|   18 /** @module requestBlocker */ |   18 /** @module requestBlocker */ | 
|   19  |   19  | 
|   20 "use strict"; |   20 "use strict"; | 
|   21  |   21  | 
|   22 const {Filter, RegExpFilter, BlockingFilter} = require("filterClasses"); |   22 const {Filter, RegExpFilter, BlockingFilter} = | 
|   23 const {Subscription} = require("subscriptionClasses"); |   23   require("../adblockpluscore/lib/filterClasses"); | 
|   24 const {defaultMatcher} = require("matcher"); |   24 const {Subscription} = require("../adblockpluscore/lib/subscriptionClasses"); | 
|   25 const {FilterNotifier} = require("filterNotifier"); |   25 const {defaultMatcher} = require("../adblockpluscore/lib/matcher"); | 
|   26 const {Prefs} = require("prefs"); |   26 const {FilterNotifier} = require("../adblockpluscore/lib/filterNotifier"); | 
|   27 const {checkWhitelisted, getKey} = require("whitelisting"); |   27 const {Prefs} = require("./prefs"); | 
|   28 const {stringifyURL, extractHostFromFrame, isThirdParty} = require("url"); |   28 const {checkWhitelisted, getKey} = require("./whitelisting"); | 
|   29 const {port} = require("messaging"); |   29 const {stringifyURL, extractHostFromFrame, isThirdParty} = require("./url"); | 
|   30 const devtools = require("devtools"); |   30 const {port} = require("./messaging"); | 
 |   31 const devtools = require("./devtools"); | 
|   31  |   32  | 
|   32 // Chrome can't distinguish between OBJECT_SUBREQUEST and OBJECT requests. |   33 // Chrome can't distinguish between OBJECT_SUBREQUEST and OBJECT requests. | 
|   33 if (!browser.webRequest.ResourceType || |   34 if (!browser.webRequest.ResourceType || | 
|   34     !("OBJECT_SUBREQUEST" in browser.webRequest.ResourceType)) |   35     !("OBJECT_SUBREQUEST" in browser.webRequest.ResourceType)) | 
|   35 { |   36 { | 
|   36   RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT; |   37   RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT; | 
|   37 } |   38 } | 
|   38  |   39  | 
|   39 // Map of content types reported by the browser to the respecitve content types |   40 // Map of content types reported by the browser to the respecitve content types | 
|   40 // used by Adblock Plus. Other content types are simply mapped to OTHER. |   41 // used by Adblock Plus. Other content types are simply mapped to OTHER. | 
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  206  |  207  | 
|  207 port.on("request.blockedByRTCWrapper", (msg, sender) => |  208 port.on("request.blockedByRTCWrapper", (msg, sender) => | 
|  208 { |  209 { | 
|  209   return ext.webRequest.onBeforeRequest._dispatch( |  210   return ext.webRequest.onBeforeRequest._dispatch( | 
|  210      new URL(msg.url), |  211      new URL(msg.url), | 
|  211      "webrtc", |  212      "webrtc", | 
|  212      sender.page, |  213      sender.page, | 
|  213      sender.frame |  214      sender.frame | 
|  214   ).includes(false); |  215   ).includes(false); | 
|  215 }); |  216 }); | 
| OLD | NEW |