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

Delta Between Two Patch Sets: include.preload.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 | « dependencies ('k') | lib/contentFiltering.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
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 this.timeout = null; 251 this.timeout = null;
252 this.observer = new MutationObserver(this.observe.bind(this)); 252 this.observer = new MutationObserver(this.observe.bind(this));
253 this.trace = this.trace.bind(this); 253 this.trace = this.trace.bind(this);
254 254
255 if (document.readyState == "loading") 255 if (document.readyState == "loading")
256 document.addEventListener("DOMContentLoaded", this.trace); 256 document.addEventListener("DOMContentLoaded", this.trace);
257 else 257 else
258 this.trace(); 258 this.trace();
259 } 259 }
260 ElementHidingTracer.prototype = { 260 ElementHidingTracer.prototype = {
261 addSelectors(selectors, filters) 261 addSelectors(selectors)
262 { 262 {
263 let pairs = selectors.map((sel, i) => [sel, filters && filters[i]]);
264
265 if (document.readyState != "loading") 263 if (document.readyState != "loading")
266 this.checkNodes([document], pairs); 264 this.checkNodes([document], selectors);
267 265
268 this.selectors.push(...pairs); 266 this.selectors.push(...selectors);
269 }, 267 },
270 268
271 checkNodes(nodes, pairs) 269 checkNodes(nodes, selectors)
272 { 270 {
273 let selectors = []; 271 let effectiveSelectors = [];
274 let filters = []; 272
275 273 for (let selector of selectors)
276 for (let [selector, filter] of pairs)
277 { 274 {
278 nodes: for (let node of nodes) 275 nodes: for (let node of nodes)
279 { 276 {
280 for (let element of node.querySelectorAll(selector)) 277 for (let element of node.querySelectorAll(selector))
281 { 278 {
282 // Only consider selectors that actually have an effect on the 279 // Only consider selectors that actually have an effect on the
283 // computed styles, and aren't overridden by rules with higher 280 // computed styles, and aren't overridden by rules with higher
284 // priority, or haven't been circumvented in a different way. 281 // priority, or haven't been circumvented in a different way.
285 if (getComputedStyle(element).display == "none") 282 if (getComputedStyle(element).display == "none")
286 { 283 {
287 // For regular element hiding, we don't know the exact filter, 284 effectiveSelectors.push(selector);
288 // but the background page can find it with the given selector.
289 // In case of element hiding emulation, the generated selector
290 // we got here is different from the selector part of the filter,
291 // but in this case we can send the whole filter text instead.
292 if (filter)
293 filters.push(filter);
294 else
295 selectors.push(selector);
296
297 break nodes; 285 break nodes;
298 } 286 }
299 } 287 }
300 } 288 }
301 } 289 }
302 290
303 if (selectors.length > 0 || filters.length > 0) 291 if (effectiveSelectors.length > 0)
304 { 292 {
305 browser.runtime.sendMessage({ 293 browser.runtime.sendMessage({
306 type: "hitLogger.traceElemHide", 294 type: "hitLogger.traceElemHide",
307 selectors, filters 295 selectors: effectiveSelectors,
296 filters: []
308 }); 297 });
309 } 298 }
310 }, 299 },
311 300
312 onTimeout() 301 onTimeout()
313 { 302 {
314 this.checkNodes(this.changedNodes, this.selectors); 303 this.checkNodes(this.changedNodes, this.selectors);
315 this.changedNodes = []; 304 this.changedNodes = [];
316 this.timeout = null; 305 this.timeout = null;
317 }, 306 },
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 document.removeEventListener("DOMContentLoaded", this.trace); 379 document.removeEventListener("DOMContentLoaded", this.trace);
391 this.observer.disconnect(); 380 this.observer.disconnect();
392 clearTimeout(this.timeout); 381 clearTimeout(this.timeout);
393 } 382 }
394 }; 383 };
395 384
396 function ContentFiltering() 385 function ContentFiltering()
397 { 386 {
398 this.styles = new Map(); 387 this.styles = new Map();
399 this.tracer = null; 388 this.tracer = null;
400 this.inline = true; 389
401 390 this.elemHideEmulation = new ElemHideEmulation(this.hideElements.bind(this));
402 this.elemHideEmulation = new ElemHideEmulation(
403 () => {},
404 this.hideElements.bind(this)
405 );
406 } 391 }
407 ContentFiltering.prototype = { 392 ContentFiltering.prototype = {
408 addStyleSheetInline(styleSheet, groupName = "standard", appendOnly = false) 393 addRulesInline(rules, groupName = "standard", appendOnly = false)
409 { 394 {
410 let style = this.styles.get(groupName); 395 let style = this.styles.get(groupName);
396
397 if (style && !appendOnly)
398 {
399 while (style.sheet.cssRules.length > 0)
400 style.sheet.deleteRule(0);
401 }
402
403 if (rules.length == 0)
404 return;
411 405
412 if (!style) 406 if (!style)
413 { 407 {
414 // Create <style> element lazily, only if we add styles. Add it to 408 // Create <style> element lazily, only if we add styles. Add it to
415 // the <head> or <html> element. If we have injected a style element 409 // the <head> or <html> element. If we have injected a style element
416 // before that has been removed (the sheet property is null), create a 410 // before that has been removed (the sheet property is null), create a
417 // new one. 411 // new one.
418 style = document.createElement("style"); 412 style = document.createElement("style");
419 (document.head || document.documentElement).appendChild(style); 413 (document.head || document.documentElement).appendChild(style);
420 414
421 // It can happen that the frame already navigated to a different 415 // It can happen that the frame already navigated to a different
422 // document while we were waiting for the background page to respond. 416 // document while we were waiting for the background page to respond.
423 // In that case the sheet property may stay null, after adding the 417 // In that case the sheet property may stay null, after adding the
424 // <style> element. 418 // <style> element.
425 if (!style.sheet) 419 if (!style.sheet)
426 return; 420 return;
427 421
428 this.styles.set(groupName, style); 422 this.styles.set(groupName, style);
429 } 423 }
430 424
431 if (appendOnly) 425 for (let rule of rules)
432 style.textContent += styleSheet; 426 style.sheet.insertRule(rule, style.sheet.cssRules.length);
433 else
434 style.textContent = styleSheet;
435 }, 427 },
436 428
437 addSelectors(selectors, groupName = "standard", appendOnly = false) 429 addSelectors(selectors, groupName = "standard", appendOnly = false)
438 { 430 {
439 if (this.inline) 431 browser.runtime.sendMessage({
440 { 432 type: "content.injectSelectors",
441 // Insert the style rules inline if we have been instructed by the 433 selectors,
442 // background page to do so. This is rarely the case, except on platforms 434 groupName,
443 // that do not support user stylesheets via the browser.tabs.insertCSS API 435 appendOnly
444 // (Firefox <53, Chrome <66, and Edge). 436 },
445 // Once all supported platforms have implemented this API, we can remove 437 rules =>
446 // the code below. See issue #5090. 438 {
447 // Related Chrome and Firefox issues: 439 if (rules)
448 // https://bugs.chromium.org/p/chromium/issues/detail?id=632009 440 {
449 // https://bugzilla.mozilla.org/show_bug.cgi?id=1310026 441 // Insert the rules inline if we have been instructed by the background
450 this.addStyleSheetInline(selectors.join(", ") + 442 // page to do so. This is rarely the case, except on platforms that do
451 " {display: none !important;}\n", 443 // not support user stylesheets via the browser.tabs.insertCSS API
452 groupName, 444 // (Firefox <53, Chrome <66, and Edge).
453 appendOnly); 445 // Once all supported platforms have implemented this API, we can remove
454 } 446 // the code below. See issue #5090.
455 else 447 // Related Chrome and Firefox issues:
456 { 448 // https://bugs.chromium.org/p/chromium/issues/detail?id=632009
457 browser.runtime.sendMessage({ 449 // https://bugzilla.mozilla.org/show_bug.cgi?id=1310026
458 type: "content.injectSelectors", 450 this.addRulesInline(rules, groupName, appendOnly);
459 selectors, 451 }
460 groupName, 452 });
461 appendOnly
462 });
463 }
464 }, 453 },
465 454
466 hideElements(elements, filters) 455 hideElements(elements, filters)
467 { 456 {
468 for (let element of elements) 457 for (let element of elements)
469 hideElement(element); 458 hideElement(element);
470 459
471 if (this.tracer) 460 if (this.tracer)
472 { 461 {
473 browser.runtime.sendMessage({ 462 browser.runtime.sendMessage({
(...skipping 12 matching lines...) Expand all
486 }, 475 },
487 response => 476 response =>
488 { 477 {
489 if (this.tracer) 478 if (this.tracer)
490 this.tracer.disconnect(); 479 this.tracer.disconnect();
491 this.tracer = null; 480 this.tracer = null;
492 481
493 if (response.trace) 482 if (response.trace)
494 this.tracer = new ElementHidingTracer(); 483 this.tracer = new ElementHidingTracer();
495 484
496 this.inline = response.inline; 485 if (response.inline)
497 486 this.addRulesInline(response.rules);
498 if (this.inline)
499 this.addStyleSheetInline(response.styleSheet);
500 487
501 if (this.tracer) 488 if (this.tracer)
502 this.tracer.addSelectors(response.selectors); 489 this.tracer.addSelectors(response.selectors);
503 490
504 this.elemHideEmulation.apply(response.emulatedPatterns); 491 this.elemHideEmulation.apply(response.emulatedPatterns);
505 }); 492 });
506 } 493 }
507 }; 494 };
508 495
509 if (document instanceof HTMLDocument) 496 if (document instanceof HTMLDocument)
(...skipping 13 matching lines...) Expand all
523 let element = event.target; 510 let element = event.target;
524 if (/^i?frame$/.test(element.localName)) 511 if (/^i?frame$/.test(element.localName))
525 checkCollapse(element); 512 checkCollapse(element);
526 }, true); 513 }, true);
527 } 514 }
528 515
529 window.checkCollapse = checkCollapse; 516 window.checkCollapse = checkCollapse;
530 window.contentFiltering = contentFiltering; 517 window.contentFiltering = contentFiltering;
531 window.typeMap = typeMap; 518 window.typeMap = typeMap;
532 window.getURLsFromElement = getURLsFromElement; 519 window.getURLsFromElement = getURLsFromElement;
LEFTRIGHT
« dependencies ('k') | lib/contentFiltering.js » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld