Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: lib/cssInjection.js

Issue 29679796: Issue 6298 - Split injected CSS hiding rule into groups of 1,024 selectors (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/
Patch Set: Update comment explaining why we split the selectors into groups of 1,024 Created Jan. 30, 2018, 1:39 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « include.preload.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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* splitSelectors(selectors)
35 {
36 // Chromium's Blink engine supports only up to 8,192 simple selectors, and
37 // even fewer compound selectors, in a rule. The exact number of selectors
38 // that would work depends on their sizes (e.g. "#foo .bar" has a size of 2).
39 // Since we don't know the sizes of the selectors here, we simply split them
40 // into groups of 1,024, based on the reasonable assumption that the average
41 // selector won't have a size greater than 8. The alternative would be to
42 // calculate the sizes of the selectors and divide them up accordingly, but
43 // this approach is more efficient and has worked well in practice. In theory
44 // this could still lead to some selectors not working on Chromium, but it is
45 // highly unlikely.
46 // See issue #6298 and https://crbug.com/804179
47 for (let i = 0; i < selectors.length; i += selectorGroupSize)
48 yield selectors.slice(i, i + selectorGroupSize);
49 }
50
51 function* createRules(selectors)
52 {
53 for (let selectorGroup of splitSelectors(selectors))
54 yield selectorGroup.join(", ") + " {display: none !important;}";
55 }
56
57 function createStyleSheet(selectors)
58 {
59 return Array.from(createRules(selectors)).join("\n");
60 }
32 61
33 function addStyleSheet(tabId, frameId, styleSheet) 62 function addStyleSheet(tabId, frameId, styleSheet)
34 { 63 {
35 browser.tabs.insertCSS(tabId, { 64 browser.tabs.insertCSS(tabId, {
36 code: styleSheet, 65 code: styleSheet,
37 cssOrigin: "user", 66 cssOrigin: "user",
38 frameId, 67 frameId,
39 matchAboutBlank: true, 68 matchAboutBlank: true,
40 runAt: "document_start" 69 runAt: "document_start"
41 }); 70 });
42 } 71 }
43 72
44 function removeStyleSheet(tabId, frameId, styleSheet) 73 function removeStyleSheet(tabId, frameId, styleSheet)
45 { 74 {
46 browser.tabs.removeCSS(tabId, { 75 browser.tabs.removeCSS(tabId, {
47 code: styleSheet, 76 code: styleSheet,
48 cssOrigin: "user", 77 cssOrigin: "user",
49 frameId, 78 frameId,
50 matchAboutBlank: true 79 matchAboutBlank: true
51 }); 80 });
52 } 81 }
53 82
54 function updateFrameStyles(tabId, frameId, selectors, groupName) 83 function updateFrameStyles(tabId, frameId, selectors, groupName)
55 { 84 {
56 let styleSheet = null; 85 let styleSheet = null;
57 if (selectors.length > 0) 86 if (selectors.length > 0)
58 styleSheet = selectors.join(", ") + "{display: none !important;}"; 87 styleSheet = createStyleSheet(selectors);
59 88
60 let frame = ext.getFrame(tabId, frameId); 89 let frame = ext.getFrame(tabId, frameId);
61 if (!frame.injectedStyleSheets) 90 if (!frame.injectedStyleSheets)
62 frame.injectedStyleSheets = new Map(); 91 frame.injectedStyleSheets = new Map();
63 92
64 let oldStyleSheet = frame.injectedStyleSheets.get(groupName); 93 let oldStyleSheet = frame.injectedStyleSheets.get(groupName);
65 94
66 // Ideally we would compare the old and new style sheets and skip this code 95 // 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 96 // 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 97 // previous instance of the frame. We must add the new style sheet
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 response.selectors = selectors; 143 response.selectors = selectors;
115 144
116 return response; 145 return response;
117 }); 146 });
118 147
119 port.on("elemhide.injectSelectors", (message, sender) => 148 port.on("elemhide.injectSelectors", (message, sender) =>
120 { 149 {
121 updateFrameStyles(sender.page.id, sender.frame.id, message.selectors, 150 updateFrameStyles(sender.page.id, sender.frame.id, message.selectors,
122 message.groupName); 151 message.groupName);
123 }); 152 });
OLDNEW
« no previous file with comments | « include.preload.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld