| 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 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 const {RegExpFilter} = require("filterClasses"); | 22 const {RegExpFilter} = require("filterClasses"); |
| 23 const {ElemHide} = require("elemHide"); | 23 const {ElemHide} = require("elemHide"); |
| 24 const {ElemHideEmulation} = require("elemHideEmulation"); | 24 const {ElemHideEmulation} = require("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 devtools = require("devtools"); |
| 29 | 29 |
| 30 const userStyleSheetsSupported = "extensionTypes" in browser && | 30 const userStyleSheetsSupported = "extensionTypes" in browser && |
| 31 "CSSOrigin" in browser.extensionTypes; | 31 "CSSOrigin" in browser.extensionTypes; |
| 32 const selectorGroupSize = 1024; |
| 33 |
| 34 function createStyleSheet(selectors) |
| 35 { |
| 36 let styleSheet = ""; |
| 37 |
| 38 // Chromium's Blink engine supports only up to 8,192 selectors; more |
| 39 // specifically, it ignores any selectors that start at index 8192 or beyond |
| 40 // in the list of plain selectors. In order to avoid spilling outside of this |
| 41 // range, we simply add multiple rules in groups of up to 1,024 selectors |
| 42 // each. |
| 43 // See issue #6298 and https://crbug.com/804179 |
| 44 for (let i = 0; i < selectors.length; i += selectorGroupSize) |
| 45 { |
| 46 styleSheet += selectors.slice(i, i + selectorGroupSize).join(", ") + |
| 47 " {display: none !important;}\n"; |
| 48 } |
| 49 |
| 50 return styleSheet; |
| 51 } |
| 32 | 52 |
| 33 function addStyleSheet(tabId, frameId, styleSheet) | 53 function addStyleSheet(tabId, frameId, styleSheet) |
| 34 { | 54 { |
| 35 browser.tabs.insertCSS(tabId, { | 55 browser.tabs.insertCSS(tabId, { |
| 36 code: styleSheet, | 56 code: styleSheet, |
| 37 cssOrigin: "user", | 57 cssOrigin: "user", |
| 38 frameId, | 58 frameId, |
| 39 matchAboutBlank: true, | 59 matchAboutBlank: true, |
| 40 runAt: "document_start" | 60 runAt: "document_start" |
| 41 }); | 61 }); |
| 42 } | 62 } |
| 43 | 63 |
| 44 function removeStyleSheet(tabId, frameId, styleSheet) | 64 function removeStyleSheet(tabId, frameId, styleSheet) |
| 45 { | 65 { |
| 46 browser.tabs.removeCSS(tabId, { | 66 browser.tabs.removeCSS(tabId, { |
| 47 code: styleSheet, | 67 code: styleSheet, |
| 48 cssOrigin: "user", | 68 cssOrigin: "user", |
| 49 frameId, | 69 frameId, |
| 50 matchAboutBlank: true | 70 matchAboutBlank: true |
| 51 }); | 71 }); |
| 52 } | 72 } |
| 53 | 73 |
| 54 function updateFrameStyles(tabId, frameId, selectors, groupName) | 74 function updateFrameStyles(tabId, frameId, selectors, groupName) |
| 55 { | 75 { |
| 56 let styleSheet = null; | 76 let styleSheet = null; |
| 57 if (selectors.length > 0) | 77 if (selectors.length > 0) |
| 58 styleSheet = selectors.join(", ") + "{display: none !important;}"; | 78 styleSheet = createStyleSheet(selectors); |
| 59 | 79 |
| 60 let frame = ext.getFrame(tabId, frameId); | 80 let frame = ext.getFrame(tabId, frameId); |
| 61 if (!frame.injectedStyleSheets) | 81 if (!frame.injectedStyleSheets) |
| 62 frame.injectedStyleSheets = new Map(); | 82 frame.injectedStyleSheets = new Map(); |
| 63 | 83 |
| 64 let oldStyleSheet = frame.injectedStyleSheets.get(groupName); | 84 let oldStyleSheet = frame.injectedStyleSheets.get(groupName); |
| 65 | 85 |
| 66 // Ideally we would compare the old and new style sheets and skip this code | 86 // Ideally we would compare the old and new style sheets and skip this code |
| 67 // if they're the same, but the old style sheet can be a leftover from a | 87 // if they're the same, but the old style sheet can be a leftover from a |
| 68 // previous instance of the frame. We must add the new style sheet | 88 // previous instance of the frame. We must add the new style sheet |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 response.selectors = selectors; | 134 response.selectors = selectors; |
| 115 | 135 |
| 116 return response; | 136 return response; |
| 117 }); | 137 }); |
| 118 | 138 |
| 119 port.on("elemhide.injectSelectors", (message, sender) => | 139 port.on("elemhide.injectSelectors", (message, sender) => |
| 120 { | 140 { |
| 121 updateFrameStyles(sender.page.id, sender.frame.id, message.selectors, | 141 updateFrameStyles(sender.page.id, sender.frame.id, message.selectors, |
| 122 message.groupName); | 142 message.groupName); |
| 123 }); | 143 }); |
| OLD | NEW |