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

Delta Between Two Patch Sets: lib/cssInjection.js

Issue 29575739: Issue 5864 - Remove previous style sheet before adding one (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/
Left Patch Set: Always remove old rules Created Oct. 14, 2017, 9:29 p.m.
Right Patch Set: Fix rebase Created Jan. 25, 2018, 2:37 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « include.preload.js ('k') | polyfill.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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("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 chrome && 30 const userStyleSheetsSupported = "extensionTypes" in browser &&
31 "CSSOrigin" in chrome.extensionTypes; 31 "CSSOrigin" in browser.extensionTypes;
32 32
33 function convertSelectors(selectors) 33 function addStyleSheet(tabId, frameId, styleSheet)
34 { 34 {
35 return selectors.join(", ") + "{display: none !important;}"; 35 browser.tabs.insertCSS(tabId, {
36 } 36 code: styleSheet,
37
38 function addStyleSheet(tabId, frameId, selectors)
39 {
40 chrome.tabs.insertCSS(tabId, {
41 code: convertSelectors(selectors),
42 cssOrigin: "user", 37 cssOrigin: "user",
43 frameId, 38 frameId,
44 matchAboutBlank: true, 39 matchAboutBlank: true,
45 runAt: "document_start" 40 runAt: "document_start"
46 }); 41 });
47 } 42 }
48 43
49 function removeStyleSheet(tabId, frameId, selectors) 44 function removeStyleSheet(tabId, frameId, styleSheet)
50 { 45 {
51 chrome.tabs.removeCSS(tabId, { 46 browser.tabs.removeCSS(tabId, {
52 code: convertSelectors(selectors), 47 code: styleSheet,
53 cssOrigin: "user", 48 cssOrigin: "user",
54 frameId, 49 frameId,
55 matchAboutBlank: true 50 matchAboutBlank: true
56 }); 51 });
52 }
53
54 function updateFrameStyles(tabId, frameId, selectors, groupName)
55 {
56 let styleSheet = null;
57 if (selectors.length > 0)
58 styleSheet = selectors.join(", ") + "{display: none !important;}";
59
60 let frame = ext.getFrame(tabId, frameId);
61 if (!frame.injectedStyleSheets)
62 frame.injectedStyleSheets = new Map();
63
64 let oldStyleSheet = frame.injectedStyleSheets.get(groupName);
65
66 // 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
68 // previous instance of the frame. We must add the new style sheet
69 // regardless.
70
71 // Add the new style sheet first to keep previously hidden elements from
72 // reappearing momentarily.
73 if (styleSheet)
74 addStyleSheet(tabId, frameId, styleSheet);
75
76 // Sometimes the old and new style sheets can be exactly the same. In such a
77 // case, do not remove the "old" style sheet, because it is in fact the new
78 // style sheet now.
79 if (oldStyleSheet && oldStyleSheet != styleSheet)
80 removeStyleSheet(tabId, frameId, oldStyleSheet);
81
82 frame.injectedStyleSheets.set(groupName, styleSheet);
57 } 83 }
58 84
59 port.on("elemhide.getSelectors", (message, sender) => 85 port.on("elemhide.getSelectors", (message, sender) =>
Manish Jethani 2017/10/14 21:35:34 Just renaming for consistency.
60 { 86 {
61 let selectors = []; 87 let selectors = [];
62 let emulatedPatterns = []; 88 let emulatedPatterns = [];
63 let trace = devtools && devtools.hasPanel(sender.page); 89 let trace = devtools && devtools.hasPanel(sender.page);
64 let inline = !userStyleSheetsSupported; 90 let inline = !userStyleSheetsSupported;
65 91
66 if (!checkWhitelisted(sender.page, sender.frame, 92 if (!checkWhitelisted(sender.page, sender.frame,
67 RegExpFilter.typeMap.DOCUMENT | 93 RegExpFilter.typeMap.DOCUMENT |
68 RegExpFilter.typeMap.ELEMHIDE)) 94 RegExpFilter.typeMap.ELEMHIDE))
69 { 95 {
70 let hostname = extractHostFromFrame(sender.frame); 96 let hostname = extractHostFromFrame(sender.frame);
71 let specificOnly = checkWhitelisted(sender.page, sender.frame, 97 let specificOnly = checkWhitelisted(sender.page, sender.frame,
72 RegExpFilter.typeMap.GENERICHIDE); 98 RegExpFilter.typeMap.GENERICHIDE);
73 99
74 selectors = ElemHide.getSelectorsForDomain( 100 selectors = ElemHide.getSelectorsForDomain(
75 hostname, 101 hostname,
76 specificOnly ? ElemHide.SPECIFIC_ONLY : ElemHide.ALL_MATCHING 102 specificOnly ? ElemHide.SPECIFIC_ONLY : ElemHide.ALL_MATCHING
77 ); 103 );
78 104
79 for (let filter of ElemHideEmulation.getRulesForDomain(hostname)) 105 for (let filter of ElemHideEmulation.getRulesForDomain(hostname))
80 emulatedPatterns.push({selector: filter.selector, text: filter.text}); 106 emulatedPatterns.push({selector: filter.selector, text: filter.text});
81 } 107 }
82 108
83 if (!inline && selectors.length > 0) 109 if (!inline)
84 addStyleSheet(sender.page.id, sender.frame.id, selectors); 110 updateFrameStyles(sender.page.id, sender.frame.id, selectors);
85 111
86 let response = {trace, inline, emulatedPatterns}; 112 let response = {trace, inline, emulatedPatterns};
87 if (trace || inline) 113 if (trace || inline)
88 response.selectors = selectors; 114 response.selectors = selectors;
89 115
90 return response; 116 return response;
91 }); 117 });
92 118
93 port.on("elemhide.injectSelectors", (message, sender) => 119 port.on("elemhide.injectSelectors", (message, sender) =>
94 { 120 {
95 if (message.oldSelectors.length > 0) 121 updateFrameStyles(sender.page.id, sender.frame.id, message.selectors,
96 removeStyleSheet(sender.page.id, sender.frame.id, message.oldSelectors); 122 message.groupName);
97
98 if (message.selectors.length > 0)
99 addStyleSheet(sender.page.id, sender.frame.id, message.selectors);
100 }); 123 });
LEFTRIGHT

Powered by Google App Engine
This is Rietveld