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

Delta Between Two Patch Sets: lib/contentFiltering.js

Issue 29893559: Issue 6999 - Generate style sheets in background page (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/
Left Patch Set: Remove individual rule injection Created Sept. 28, 2018, 8:15 p.m.
Right Patch Set: Pass selectors if and only if trace is true Created Oct. 2, 2018, 7:07 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') | no next file » | 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 contentFiltering */ 18 /** @module contentFiltering */
19 19
20 "use strict"; 20 "use strict";
21 21
22 const {RegExpFilter} = require("../adblockpluscore/lib/filterClasses"); 22 const {RegExpFilter} = require("../adblockpluscore/lib/filterClasses");
23 const {ElemHide, createStyleSheet} = require("../adblockpluscore/lib/elemHide"); 23 const {ElemHide, createStyleSheet,
24 rulesFromStyleSheet} = require("../adblockpluscore/lib/elemHide");
24 const {ElemHideEmulation} = require("../adblockpluscore/lib/elemHideEmulation"); 25 const {ElemHideEmulation} = require("../adblockpluscore/lib/elemHideEmulation");
25 const {filterNotifier} = require("../adblockpluscore/lib/filterNotifier"); 26 const {filterNotifier} = require("../adblockpluscore/lib/filterNotifier");
26 const {Snippets, compileScript} = require("../adblockpluscore/lib/snippets"); 27 const {Snippets, compileScript} = require("../adblockpluscore/lib/snippets");
27 const {checkWhitelisted} = require("./whitelisting"); 28 const {checkWhitelisted} = require("./whitelisting");
28 const {extractHostFromFrame} = require("./url"); 29 const {extractHostFromFrame} = require("./url");
29 const {port} = require("./messaging"); 30 const {port} = require("./messaging");
30 const {HitLogger, logRequest} = require("./hitLogger"); 31 const {HitLogger, logRequest} = require("./hitLogger");
31 const info = require("info"); 32 const info = require("info");
32 33
33 // Chromium's support for tabs.removeCSS is still a work in progress and the 34 // Chromium's support for tabs.removeCSS is still a work in progress and the
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 { 185 {
185 // See the comment in the catch block associated with the call to 186 // See the comment in the catch block associated with the call to
186 // tabs.insertCSS for why we catch any error here and simply 187 // tabs.insertCSS for why we catch any error here and simply
187 // return a rejected promise. 188 // return a rejected promise.
188 return Promise.reject(error); 189 return Promise.reject(error);
189 } 190 }
190 } 191 }
191 192
192 port.on("content.applyFilters", (message, sender) => 193 port.on("content.applyFilters", (message, sender) =>
193 { 194 {
194 let styleSheet = ""; 195 let styleSheet = {code: "", selectors: []};
195 let selectors = [];
196 let emulatedPatterns = []; 196 let emulatedPatterns = [];
197 let trace = HitLogger.hasListener(sender.page.id); 197 let trace = HitLogger.hasListener(sender.page.id);
198 let inline = !userStyleSheetsSupported; 198 let inline = !userStyleSheetsSupported;
199 199
200 let {elemhide, snippets} = message.filterTypes || 200 let {elemhide, snippets} = message.filterTypes ||
201 {elemhide: true, snippets: true}; 201 {elemhide: true, snippets: true};
202 202
203 if (!checkWhitelisted(sender.page, sender.frame, null, 203 if (!checkWhitelisted(sender.page, sender.frame, null,
204 RegExpFilter.typeMap.DOCUMENT)) 204 RegExpFilter.typeMap.DOCUMENT))
205 { 205 {
(...skipping 16 matching lines...) Expand all
222 }, filter); 222 }, filter);
223 }); 223 });
224 } 224 }
225 } 225 }
226 226
227 if (elemhide && !checkWhitelisted(sender.page, sender.frame, null, 227 if (elemhide && !checkWhitelisted(sender.page, sender.frame, null,
228 RegExpFilter.typeMap.ELEMHIDE)) 228 RegExpFilter.typeMap.ELEMHIDE))
229 { 229 {
230 let specificOnly = checkWhitelisted(sender.page, sender.frame, null, 230 let specificOnly = checkWhitelisted(sender.page, sender.frame, null,
231 RegExpFilter.typeMap.GENERICHIDE); 231 RegExpFilter.typeMap.GENERICHIDE);
232 selectors = ElemHide.getSelectorsForDomain(docDomain, specificOnly); 232 styleSheet = ElemHide.generateStyleSheetForDomain(docDomain, specificOnly,
233 styleSheet = createStyleSheet(selectors); 233 trace);
234 234
235 for (let filter of ElemHideEmulation.getRulesForDomain(docDomain)) 235 for (let filter of ElemHideEmulation.getRulesForDomain(docDomain))
236 emulatedPatterns.push({selector: filter.selector, text: filter.text}); 236 emulatedPatterns.push({selector: filter.selector, text: filter.text});
237 } 237 }
238 } 238 }
239 239
240 if (!inline && !updateFrameStyles(sender.page.id, sender.frame.id, 240 if (!inline && !updateFrameStyles(sender.page.id, sender.frame.id,
241 styleSheet)) 241 styleSheet.code))
242 { 242 {
243 inline = true; 243 inline = true;
244 } 244 }
245 245
246 let response = {trace, inline, emulatedPatterns}; 246 let response = {trace, inline, emulatedPatterns};
247 247
248 if (inline) 248 if (inline)
249 response.styleSheet = styleSheet; 249 response.rules = [...rulesFromStyleSheet(styleSheet.code)];
250 250
251 if (trace) 251 if (trace)
252 response.selectors = selectors; 252 response.selectors = styleSheet.selectors;
253 253
254 return response; 254 return response;
255 }); 255 });
256 256
257 port.on("content.injectSelectors", (message, sender) => 257 port.on("content.injectSelectors", (message, sender) =>
258 { 258 {
259 updateFrameStyles(sender.page.id, sender.frame.id, 259 let styleSheet = createStyleSheet(message.selectors);
260 createStyleSheet(message.selectors), 260 if (!userStyleSheetsSupported ||
261 message.groupName, message.appendOnly); 261 !updateFrameStyles(sender.page.id, sender.frame.id, styleSheet,
262 message.groupName, message.appendOnly))
263 {
264 return [...rulesFromStyleSheet(styleSheet)];
265 }
262 }); 266 });
263 267
264 fetch(browser.extension.getURL("/snippets.js"), {cache: "no-cache"}) 268 fetch(browser.extension.getURL("/snippets.js"), {cache: "no-cache"})
265 .then(response => response.ok ? response.text() : "") 269 .then(response => response.ok ? response.text() : "")
266 .then(text => 270 .then(text =>
267 { 271 {
268 snippetsLibrarySource = text; 272 snippetsLibrarySource = text;
269 }); 273 });
LEFTRIGHT

Powered by Google App Engine
This is Rietveld