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 Created Oct. 18, 2017, 1:30 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 12 matching lines...) Expand all
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 32
33 function hideElements(tabId, frameId, selectors) 33 function addStyleSheet(tabId, frameId, styleSheet)
34 { 34 {
35 browser.tabs.insertCSS(tabId, { 35 browser.tabs.insertCSS(tabId, {
36 code: selectors.join(", ") + "{display: none !important;}", 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 port.on("elemhide.getSelectors", (msg, sender) => 44 function removeStyleSheet(tabId, frameId, styleSheet)
45 {
46 chrome.tabs.removeCSS(tabId, {
47 code: styleSheet,
48 cssOrigin: "user",
49 frameId,
50 matchAboutBlank: true
51 });
52 }
53
54 function replaceStyleSheet(tabId, frameId, oldStyleSheet, newStyleSheet)
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 {
70 let styleSheet = null;
71 if (selectors.length > 0)
72 styleSheet = selectors.join(", ") + "{display: none !important;}";
73
74 let frame = ext.getFrame(pageId, frameId);
75 if (!frame.injectedStyleSheets)
76 frame.injectedStyleSheets = new Map();
77
78 let oldStyleSheet = frame.injectedStyleSheets.get(groupName);
79
80 // Ideally we would compare the old and new style sheets and skip this call
81 // 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
83 // regardless.
84 replaceStyleSheet(pageId, frameId, oldStyleSheet, styleSheet);
85 frame.injectedStyleSheets.set(groupName, styleSheet);
86 }
87
88 port.on("elemhide.getSelectors", (message, sender) =>
45 { 89 {
46 let selectors = []; 90 let selectors = [];
47 let emulatedPatterns = []; 91 let emulatedPatterns = [];
48 let trace = devtools && devtools.hasPanel(sender.page); 92 let trace = devtools && devtools.hasPanel(sender.page);
49 let inject = !userStyleSheetsSupported; 93 let inline = !userStyleSheetsSupported;
50 94
51 if (!checkWhitelisted(sender.page, sender.frame, 95 if (!checkWhitelisted(sender.page, sender.frame,
52 RegExpFilter.typeMap.DOCUMENT | 96 RegExpFilter.typeMap.DOCUMENT |
53 RegExpFilter.typeMap.ELEMHIDE)) 97 RegExpFilter.typeMap.ELEMHIDE))
54 { 98 {
55 let hostname = extractHostFromFrame(sender.frame); 99 let hostname = extractHostFromFrame(sender.frame);
56 let specificOnly = checkWhitelisted(sender.page, sender.frame, 100 let specificOnly = checkWhitelisted(sender.page, sender.frame,
57 RegExpFilter.typeMap.GENERICHIDE); 101 RegExpFilter.typeMap.GENERICHIDE);
58 102
59 selectors = ElemHide.getSelectorsForDomain( 103 selectors = ElemHide.getSelectorsForDomain(
60 hostname, 104 hostname,
61 specificOnly ? ElemHide.SPECIFIC_ONLY : ElemHide.ALL_MATCHING 105 specificOnly ? ElemHide.SPECIFIC_ONLY : ElemHide.ALL_MATCHING
62 ); 106 );
63 107
64 for (let filter of ElemHideEmulation.getRulesForDomain(hostname)) 108 for (let filter of ElemHideEmulation.getRulesForDomain(hostname))
65 emulatedPatterns.push({selector: filter.selector, text: filter.text}); 109 emulatedPatterns.push({selector: filter.selector, text: filter.text});
66 } 110 }
67 111
68 if (!inject && selectors.length > 0) 112 if (!inline)
69 hideElements(sender.page.id, sender.frame.id, selectors); 113 updateFrameStyles(sender.page.id, sender.frame.id, selectors);
70 114
71 let response = {trace, inject, emulatedPatterns}; 115 let response = {trace, inline, emulatedPatterns};
72 if (trace || inject) 116 if (trace || inline)
73 response.selectors = selectors; 117 response.selectors = selectors;
74 118
75 return response; 119 return response;
76 }); 120 });
77 121
78 port.on("elemhide.injectSelectors", (msg, sender) => 122 port.on("elemhide.injectSelectors", (message, sender) =>
79 { 123 {
80 hideElements(sender.page.id, sender.frame.id, msg.selectors); 124 updateFrameStyles(sender.page.id, sender.frame.id, message.selectors,
125 message.groupName);
81 }); 126 });
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