| 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 cssInjection */ | 18 /** @module cssInjection */ | 
| 19 | 19 | 
| 20 "use strict"; | 20 "use strict"; | 
| 21 | 21 | 
| 22 const {RegExpFilter} = require("../adblockpluscore/lib/filterClasses"); | 22 const {RegExpFilter} = require("../adblockpluscore/lib/filterClasses"); | 
| 23 const {ElemHide} = require("../adblockpluscore/lib/elemHide"); | 23 const {ElemHide} = require("../adblockpluscore/lib/elemHide"); | 
| 24 const {ElemHideEmulation} = require("../adblockpluscore/lib/elemHideEmulation"); | 24 const {ElemHideEmulation} = require("../adblockpluscore/lib/elemHideEmulation"); | 
| 25 const {checkWhitelisted} = require("./whitelisting"); | 25 const {checkWhitelisted} = require("./whitelisting"); | 
| 26 const {extractHostFromFrame} = require("./url"); | 26 const {extractHostFromFrame} = require("./url"); | 
| 27 const {port} = require("./messaging"); | 27 const {port} = require("./messaging"); | 
| 28 const devtools = require("./devtools"); | 28 const {hasListener} = require("./hitLogger"); | 
| 29 const info = require("../buildtools/info"); | 29 const info = require("../buildtools/info"); | 
| 30 | 30 | 
| 31 // Chromium's support for tabs.removeCSS is still a work in progress and the | 31 // Chromium's support for tabs.removeCSS is still a work in progress and the | 
| 32 // API is likely to be different from Firefox's; for now we just don't use it | 32 // API is likely to be different from Firefox's; for now we just don't use it | 
| 33 // at all, even if it's available. | 33 // at all, even if it's available. | 
| 34 // See https://crbug.com/608854 | 34 // See https://crbug.com/608854 | 
| 35 const styleSheetRemovalSupported = info.platform == "gecko"; | 35 const styleSheetRemovalSupported = info.platform == "gecko"; | 
| 36 | 36 | 
| 37 const selectorGroupSize = 1024; | 37 const selectorGroupSize = 1024; | 
| 38 | 38 | 
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 154     removeStyleSheet(tabId, frameId, oldStyleSheet); | 154     removeStyleSheet(tabId, frameId, oldStyleSheet); | 
| 155 | 155 | 
| 156   frame.injectedStyleSheets.set(groupName, styleSheet); | 156   frame.injectedStyleSheets.set(groupName, styleSheet); | 
| 157   return true; | 157   return true; | 
| 158 } | 158 } | 
| 159 | 159 | 
| 160 port.on("elemhide.getSelectors", (message, sender) => | 160 port.on("elemhide.getSelectors", (message, sender) => | 
| 161 { | 161 { | 
| 162   let selectors = []; | 162   let selectors = []; | 
| 163   let emulatedPatterns = []; | 163   let emulatedPatterns = []; | 
| 164   let trace = devtools.hasPanel(sender.page.id); | 164   let trace = hasListener(sender.page.id); | 
| 165   let inline = !userStyleSheetsSupported; | 165   let inline = !userStyleSheetsSupported; | 
| 166 | 166 | 
| 167   if (!checkWhitelisted(sender.page, sender.frame, null, | 167   if (!checkWhitelisted(sender.page, sender.frame, null, | 
| 168                         RegExpFilter.typeMap.DOCUMENT | | 168                         RegExpFilter.typeMap.DOCUMENT | | 
| 169                         RegExpFilter.typeMap.ELEMHIDE)) | 169                         RegExpFilter.typeMap.ELEMHIDE)) | 
| 170   { | 170   { | 
| 171     let hostname = extractHostFromFrame(sender.frame); | 171     let hostname = extractHostFromFrame(sender.frame); | 
| 172     let specificOnly = checkWhitelisted(sender.page, sender.frame, null, | 172     let specificOnly = checkWhitelisted(sender.page, sender.frame, null, | 
| 173                                         RegExpFilter.typeMap.GENERICHIDE); | 173                                         RegExpFilter.typeMap.GENERICHIDE); | 
| 174 | 174 | 
| (...skipping 24 matching lines...) Expand all  Loading... | 
| 199     response.inlineEmulated = true; | 199     response.inlineEmulated = true; | 
| 200 | 200 | 
| 201   return response; | 201   return response; | 
| 202 }); | 202 }); | 
| 203 | 203 | 
| 204 port.on("elemhide.injectSelectors", (message, sender) => | 204 port.on("elemhide.injectSelectors", (message, sender) => | 
| 205 { | 205 { | 
| 206   updateFrameStyles(sender.page.id, sender.frame.id, message.selectors, | 206   updateFrameStyles(sender.page.id, sender.frame.id, message.selectors, | 
| 207                     message.groupName); | 207                     message.groupName); | 
| 208 }); | 208 }); | 
| OLD | NEW | 
|---|