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: Maintain all style sheets in lib/cssInjection.js Created Oct. 18, 2017, 1:05 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 addStyleSheet(tabId, frameId, styleSheet) 33 function addStyleSheet(tabId, frameId, styleSheet)
34 { 34 {
35 chrome.tabs.insertCSS(tabId, { 35 browser.tabs.insertCSS(tabId, {
36 code: styleSheet, 36 code: styleSheet,
37 cssOrigin: "user", 37 cssOrigin: "user",
38 frameId, 38 frameId,
39 matchAboutBlank: true, 39 matchAboutBlank: true,
40 runAt: "document_start" 40 runAt: "document_start"
41 }); 41 });
42 } 42 }
43 43
44 function removeStyleSheet(tabId, frameId, styleSheet) 44 function removeStyleSheet(tabId, frameId, styleSheet)
45 { 45 {
46 chrome.tabs.removeCSS(tabId, { 46 browser.tabs.removeCSS(tabId, {
47 code: styleSheet, 47 code: styleSheet,
48 cssOrigin: "user", 48 cssOrigin: "user",
49 frameId, 49 frameId,
50 matchAboutBlank: true 50 matchAboutBlank: true
51 }); 51 });
52 } 52 }
53 53
54 function replaceStyleSheet(tabId, frameId, oldStyleSheet, newStyleSheet) 54 function updateFrameStyles(tabId, frameId, selectors, groupName)
55 {
56 // Add the new style sheet first to avoid previously hidden elements from
57 // reappearing momentarily.
58 if (newStyleSheet)
59 addStyleSheet(tabId, frameId, newStyleSheet);
60
61 // Sometimes the old and new style sheets can be exactly the same. In such a
62 // case, do not remove the "old" style sheet, because it is in fact the new
63 // style sheet now.
64 if (oldStyleSheet && oldStyleSheet != newStyleSheet)
65 removeStyleSheet(tabId, frameId, oldStyleSheet);
66 }
67
68 function updateFrameStyles(pageId, frameId, selectors, groupName)
69 { 55 {
70 let styleSheet = null; 56 let styleSheet = null;
71 if (selectors.length > 0) 57 if (selectors.length > 0)
72 styleSheet = selectors.join(", ") + "{display: none !important;}"; 58 styleSheet = selectors.join(", ") + "{display: none !important;}";
73 59
74 let frame = ext.getFrame(pageId, frameId); 60 let frame = ext.getFrame(tabId, frameId);
75 if (!frame.injectedStyleSheets) 61 if (!frame.injectedStyleSheets)
76 frame.injectedStyleSheets = new Map(); 62 frame.injectedStyleSheets = new Map();
77 63
78 let oldStyleSheet = frame.injectedStyleSheets.get(groupName); 64 let oldStyleSheet = frame.injectedStyleSheets.get(groupName);
79 65
80 // Ideally we would compare the old and new style sheets and skip this call 66 // Ideally we would compare the old and new style sheets and skip this code
81 // if they're the same, but the old style sheet can be a leftover from a 67 // if they're the same, but the old style sheet can be a leftover from a
82 // previous instance of the frame. We must add the new style sheet 68 // previous instance of the frame. We must add the new style sheet
83 // regardless. 69 // regardless.
84 replaceStyleSheet(pageId, frameId, oldStyleSheet, styleSheet); 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
85 frame.injectedStyleSheets.set(groupName, styleSheet); 82 frame.injectedStyleSheets.set(groupName, styleSheet);
86 } 83 }
87 84
88 port.on("elemhide.getSelectors", (message, sender) => 85 port.on("elemhide.getSelectors", (message, sender) =>
89 { 86 {
90 let selectors = []; 87 let selectors = [];
91 let emulatedPatterns = []; 88 let emulatedPatterns = [];
92 let trace = devtools && devtools.hasPanel(sender.page); 89 let trace = devtools && devtools.hasPanel(sender.page);
93 let inline = !userStyleSheetsSupported; 90 let inline = !userStyleSheetsSupported;
94 91
(...skipping 17 matching lines...) Expand all
112 if (!inline) 109 if (!inline)
113 updateFrameStyles(sender.page.id, sender.frame.id, selectors); 110 updateFrameStyles(sender.page.id, sender.frame.id, selectors);
114 111
115 let response = {trace, inline, emulatedPatterns}; 112 let response = {trace, inline, emulatedPatterns};
116 if (trace || inline) 113 if (trace || inline)
117 response.selectors = selectors; 114 response.selectors = selectors;
118 115
119 return response; 116 return response;
120 }); 117 });
121 118
122 port.on("elemhide.injectSelectors", (message, sender) => 119 port.on("elemhide.injectSelectors", (message, sender) =>
Manish Jethani 2017/10/18 13:16:45 This is now again "injectSelectors"
123 { 120 {
124 updateFrameStyles(sender.page.id, sender.frame.id, message.selectors, 121 updateFrameStyles(sender.page.id, sender.frame.id, message.selectors,
125 message.groupName); 122 message.groupName);
126 }); 123 });
LEFTRIGHT

Powered by Google App Engine
This is Rietveld