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

Side by Side Diff: lib/cssInjection.js

Issue 29737602: Issue 4580 - Make filter/request logging use plain tabIds, prepare for multi-tab requests (Closed)
Patch Set: Created April 2, 2018, 12:27 a.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 | « lib/csp.js ('k') | lib/devtools.js » ('j') | lib/devtools.js » ('J')
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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 removeStyleSheet(tabId, frameId, oldStyleSheet); 154 removeStyleSheet(tabId, frameId, oldStyleSheet);
155 155
156 frame.injectedStyleSheets.set(groupName, styleSheet); 156 frame.injectedStyleSheets.set(groupName, styleSheet);
157 return true; 157 return true;
158 } 158 }
159 159
160 port.on("elemhide.getSelectors", (message, sender) => 160 port.on("elemhide.getSelectors", (message, sender) =>
161 { 161 {
162 let selectors = []; 162 let selectors = [];
163 let emulatedPatterns = []; 163 let emulatedPatterns = [];
164 let trace = devtools && devtools.hasPanel(sender.page); 164 let trace = devtools.hasPanel(sender.page.id);
165 let inline = !userStyleSheetsSupported; 165 let inline = !userStyleSheetsSupported;
166 166
167 if (!checkWhitelisted(sender.page, sender.frame, 167 if (!checkWhitelisted(sender.page, sender.frame,
168 RegExpFilter.typeMap.DOCUMENT | 168 RegExpFilter.typeMap.DOCUMENT |
169 RegExpFilter.typeMap.ELEMHIDE)) 169 RegExpFilter.typeMap.ELEMHIDE))
170 { 170 {
171 let hostname = extractHostFromFrame(sender.frame); 171 let hostname = extractHostFromFrame(sender.frame);
172 let specificOnly = checkWhitelisted(sender.page, sender.frame, 172 let specificOnly = checkWhitelisted(sender.page, sender.frame,
173 RegExpFilter.typeMap.GENERICHIDE); 173 RegExpFilter.typeMap.GENERICHIDE);
174 174
(...skipping 24 matching lines...) Expand all
199 response.inlineEmulated = true; 199 response.inlineEmulated = true;
200 200
201 return response; 201 return response;
202 }); 202 });
203 203
204 port.on("elemhide.injectSelectors", (message, sender) => 204 port.on("elemhide.injectSelectors", (message, sender) =>
205 { 205 {
206 updateFrameStyles(sender.page.id, sender.frame.id, message.selectors, 206 updateFrameStyles(sender.page.id, sender.frame.id, message.selectors,
207 message.groupName); 207 message.groupName);
208 }); 208 });
OLDNEW
« no previous file with comments | « lib/csp.js ('k') | lib/devtools.js » ('j') | lib/devtools.js » ('J')

Powered by Google App Engine
This is Rietveld