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

Side by Side Diff: lib/cssInjection.js

Issue 29575739: Issue 5864 - Remove previous style sheet before adding one (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/
Patch Set: Rebase and fix errors Created Jan. 24, 2018, 4:36 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') | polyfill.js » ('j') | 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 25 matching lines...) Expand all
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 updateFrameStyles(pageId, frameId, selectors, groupName) 54 function updateFrameStyles(tabId, frameId, selectors, groupName)
55 { 55 {
56 let styleSheet = null; 56 let styleSheet = null;
57 if (selectors.length > 0) 57 if (selectors.length > 0)
58 styleSheet = selectors.join(", ") + "{display: none !important;}"; 58 styleSheet = selectors.join(", ") + "{display: none !important;}";
59 59
60 let frame = ext.getFrame(pageId, frameId); 60 let frame = ext.getFrame(tabId, frameId);
61 if (!frame.injectedStyleSheets) 61 if (!frame.injectedStyleSheets)
62 frame.injectedStyleSheets = new Map(); 62 frame.injectedStyleSheets = new Map();
63 63
64 let oldStyleSheet = frame.injectedStyleSheets.get(groupName); 64 let oldStyleSheet = frame.injectedStyleSheets.get(groupName);
65 65
66 // Ideally we would compare the old and new style sheets and skip this code 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 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 68 // previous instance of the frame. We must add the new style sheet
69 // regardless. 69 // regardless.
70 70
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 response.selectors = selectors; 114 response.selectors = selectors;
115 115
116 return response; 116 return response;
117 }); 117 });
118 118
119 port.on("elemhide.injectSelectors", (message, sender) => 119 port.on("elemhide.injectSelectors", (message, sender) =>
120 { 120 {
121 updateFrameStyles(sender.page.id, sender.frame.id, message.selectors, 121 updateFrameStyles(sender.page.id, sender.frame.id, message.selectors,
122 message.groupName); 122 message.groupName);
123 }); 123 });
OLDNEW
« no previous file with comments | « include.preload.js ('k') | polyfill.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld