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

Delta Between Two Patch Sets: include.preload.js

Issue 29575739: Issue 5864 - Remove previous style sheet before adding one (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/
Left Patch Set: Remove style sheet if selectors list is empty Created Oct. 14, 2017, 1:34 p.m.
Right Patch Set: Fix rebase Created Jan. 25, 2018, 2:37 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 | « no previous file | lib/cssInjection.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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 function checkCollapse(element) 158 function checkCollapse(element)
159 { 159 {
160 let mediatype = typeMap.get(element.localName); 160 let mediatype = typeMap.get(element.localName);
161 if (!mediatype) 161 if (!mediatype)
162 return; 162 return;
163 163
164 let urls = getURLsFromElement(element); 164 let urls = getURLsFromElement(element);
165 if (urls.length == 0) 165 if (urls.length == 0)
166 return; 166 return;
167 167
168 chrome.runtime.sendMessage( 168 browser.runtime.sendMessage(
169 { 169 {
170 type: "filters.collapse", 170 type: "filters.collapse",
171 urls, 171 urls,
172 mediatype, 172 mediatype,
173 baseURL: document.location.href 173 baseURL: document.location.href
174 }, 174 },
175 175
176 collapse => 176 collapse =>
177 { 177 {
178 if (collapse) 178 if (collapse)
179 { 179 {
180 hideElement(element); 180 hideElement(element);
181 } 181 }
182 } 182 }
183 ); 183 );
184 } 184 }
185 185
186 function checkSitekey() 186 function checkSitekey()
187 { 187 {
188 let attr = document.documentElement.getAttribute("data-adblockkey"); 188 let attr = document.documentElement.getAttribute("data-adblockkey");
189 if (attr) 189 if (attr)
190 chrome.runtime.sendMessage({type: "filters.addKey", token: attr}); 190 browser.runtime.sendMessage({type: "filters.addKey", token: attr});
191 } 191 }
192 192
193 function ElementHidingTracer() 193 function ElementHidingTracer()
194 { 194 {
195 this.selectors = []; 195 this.selectors = [];
196 this.changedNodes = []; 196 this.changedNodes = [];
197 this.timeout = null; 197 this.timeout = null;
198 this.observer = new MutationObserver(this.observe.bind(this)); 198 this.observer = new MutationObserver(this.observe.bind(this));
199 this.trace = this.trace.bind(this); 199 this.trace = this.trace.bind(this);
200 200
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 selectors.push(selector); 241 selectors.push(selector);
242 242
243 break nodes; 243 break nodes;
244 } 244 }
245 } 245 }
246 } 246 }
247 } 247 }
248 248
249 if (selectors.length > 0 || filters.length > 0) 249 if (selectors.length > 0 || filters.length > 0)
250 { 250 {
251 chrome.runtime.sendMessage({ 251 browser.runtime.sendMessage({
252 type: "devtools.traceElemHide", 252 type: "devtools.traceElemHide",
253 selectors, filters 253 selectors, filters
254 }); 254 });
255 } 255 }
256 }, 256 },
257 257
258 onTimeout() 258 onTimeout()
259 { 259 {
260 this.checkNodes(this.changedNodes, this.selectors); 260 this.checkNodes(this.changedNodes, this.selectors);
261 this.changedNodes = []; 261 this.changedNodes = [];
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 { 335 {
336 document.removeEventListener("DOMContentLoaded", this.trace); 336 document.removeEventListener("DOMContentLoaded", this.trace);
337 this.observer.disconnect(); 337 this.observer.disconnect();
338 clearTimeout(this.timeout); 338 clearTimeout(this.timeout);
339 } 339 }
340 }; 340 };
341 341
342 function ElemHide() 342 function ElemHide()
343 { 343 {
344 this.shadow = this.createShadowTree(); 344 this.shadow = this.createShadowTree();
345 this.style = null; 345 this.styles = new Map();
346 this.tracer = null; 346 this.tracer = null;
347 this.inject = true; 347 this.inline = true;
348 this.emulatedPatterns = null; 348 this.emulatedPatterns = null;
349 this.injectedSelectors = [];
350 349
351 this.elemHideEmulation = new ElemHideEmulation( 350 this.elemHideEmulation = new ElemHideEmulation(
352 this.addSelectors.bind(this), 351 this.addSelectors.bind(this),
353 this.hideElements.bind(this) 352 this.hideElements.bind(this)
354 ); 353 );
355 } 354 }
356 ElemHide.prototype = { 355 ElemHide.prototype = {
357 selectorGroupSize: 200, 356 selectorGroupSize: 200,
358 357
359 createShadowTree() 358 createShadowTree()
(...skipping 13 matching lines...) Expand all
373 // Finally since some users have both AdBlock and Adblock Plus installed we 372 // Finally since some users have both AdBlock and Adblock Plus installed we
374 // have to consider how the two extensions interact. For example we want to 373 // have to consider how the two extensions interact. For example we want to
375 // avoid creating the shadowRoot twice. 374 // avoid creating the shadowRoot twice.
376 let shadow = document.documentElement.shadowRoot || 375 let shadow = document.documentElement.shadowRoot ||
377 document.documentElement.createShadowRoot(); 376 document.documentElement.createShadowRoot();
378 shadow.appendChild(document.createElement("shadow")); 377 shadow.appendChild(document.createElement("shadow"));
379 378
380 return shadow; 379 return shadow;
381 }, 380 },
382 381
383 injectSelectors(selectors) 382 addSelectorsInline(selectors, groupName)
384 { 383 {
385 if (selectors.length == 0 && this.injectedSelectors.length == 0) 384 let style = this.styles.get(groupName);
386 return; 385
387 386 if (style)
388 let message = {type: "elemhide.injectSelectors"}; 387 {
389 388 while (style.sheet.cssRules.length > 0)
390 if (selectors.length > 0) 389 style.sheet.deleteRule(0);
391 message.selectors = selectors; 390 }
392 391
393 if (this.injectedSelectors.length > 0)
394 message.previousSelectors = this.injectedSelectors;
395
396 chrome.runtime.sendMessage(message);
397
398 this.injectedSelectors = selectors;
399 },
400
401 addSelectorsInline(selectors)
402 {
403 if (selectors.length == 0) 392 if (selectors.length == 0)
404 return; 393 return;
405 394
406 if (!this.style) 395 if (!style)
407 { 396 {
408 // Create <style> element lazily, only if we add styles. Add it to 397 // Create <style> element lazily, only if we add styles. Add it to
409 // the shadow DOM if possible. Otherwise fallback to the <head> or 398 // the shadow DOM if possible. Otherwise fallback to the <head> or
410 // <html> element. If we have injected a style element before that 399 // <html> element. If we have injected a style element before that
411 // has been removed (the sheet property is null), create a new one. 400 // has been removed (the sheet property is null), create a new one.
412 this.style = document.createElement("style"); 401 style = document.createElement("style");
413 (this.shadow || document.head || 402 (this.shadow || document.head ||
414 document.documentElement).appendChild(this.style); 403 document.documentElement).appendChild(style);
415 404
416 // It can happen that the frame already navigated to a different 405 // It can happen that the frame already navigated to a different
417 // document while we were waiting for the background page to respond. 406 // document while we were waiting for the background page to respond.
418 // In that case the sheet property will stay null, after addind the 407 // In that case the sheet property will stay null, after addind the
419 // <style> element to the shadow DOM. 408 // <style> element to the shadow DOM.
420 if (!this.style.sheet) 409 if (!style.sheet)
421 return; 410 return;
411
412 this.styles.set(groupName, style);
422 } 413 }
423 414
424 // If using shadow DOM, we have to add the ::content pseudo-element 415 // If using shadow DOM, we have to add the ::content pseudo-element
425 // before each selector, in order to match elements within the 416 // before each selector, in order to match elements within the
426 // insertion point. 417 // insertion point.
427 let preparedSelectors = []; 418 let preparedSelectors = [];
428 if (this.shadow) 419 if (this.shadow)
429 { 420 {
430 for (let selector of selectors) 421 for (let selector of selectors)
431 { 422 {
(...skipping 17 matching lines...) Expand all
449 let selector = preparedSelectors.slice( 440 let selector = preparedSelectors.slice(
450 i, i + this.selectorGroupSize 441 i, i + this.selectorGroupSize
451 ).join(", "); 442 ).join(", ");
452 this.style.sheet.insertRule(selector + "{display: none !important;}", 443 this.style.sheet.insertRule(selector + "{display: none !important;}",
453 this.style.sheet.cssRules.length); 444 this.style.sheet.cssRules.length);
454 } 445 }
455 }, 446 },
456 447
457 addSelectors(selectors, filters) 448 addSelectors(selectors, filters)
458 { 449 {
459 if (this.inject) 450 if (this.inline)
460 { 451 {
461 // Insert the style rules inline if we have been instructed by the 452 // Insert the style rules inline if we have been instructed by the
462 // background page to do so. This is usually the case, except on platforms 453 // background page to do so. This is usually the case, except on platforms
463 // that do support user stylesheets via the chrome.tabs.insertCSS API 454 // that do support user stylesheets via the browser.tabs.insertCSS API
464 // (Firefox 53 onwards for now and possibly Chrome in the near future). 455 // (Firefox 53 onwards for now and possibly Chrome in the near future).
465 // Once all supported platforms have implemented this API, we can remove 456 // Once all supported platforms have implemented this API, we can remove
466 // the code below. See issue #5090. 457 // the code below. See issue #5090.
467 // Related Chrome and Firefox issues: 458 // Related Chrome and Firefox issues:
468 // https://bugs.chromium.org/p/chromium/issues/detail?id=632009 459 // https://bugs.chromium.org/p/chromium/issues/detail?id=632009
469 // https://bugzilla.mozilla.org/show_bug.cgi?id=1310026 460 // https://bugzilla.mozilla.org/show_bug.cgi?id=1310026
470 this.addSelectorsInline(selectors); 461 this.addSelectorsInline(selectors, "emulated");
Manish Jethani 2017/10/14 13:38:18 injectSelectors is now addSelectorsInline; the new
471 } 462 }
472 else 463 else
473 { 464 {
474 this.injectSelectors(selectors); 465 browser.runtime.sendMessage({
475 } 466 type: "elemhide.injectSelectors",
476 467 selectors,
477 if (selectors.length == 0) 468 groupName: "emulated"
478 return; 469 });
470 }
479 471
480 if (this.tracer) 472 if (this.tracer)
481 this.tracer.addSelectors(selectors, filters); 473 this.tracer.addSelectors(selectors, filters);
482 }, 474 },
483 475
484 hideElements(elements, filters) 476 hideElements(elements, filters)
485 { 477 {
486 for (let element of elements) 478 for (let element of elements)
487 hideElement(element); 479 hideElement(element);
488 480
489 if (this.tracer) 481 if (this.tracer)
490 { 482 {
491 chrome.runtime.sendMessage({ 483 browser.runtime.sendMessage({
492 type: "devtools.traceElemHide", 484 type: "devtools.traceElemHide",
493 selectors: [], 485 selectors: [],
494 filters 486 filters
495 }); 487 });
496 } 488 }
497 }, 489 },
498 490
499 apply() 491 apply()
500 { 492 {
501 chrome.runtime.sendMessage({type: "elemhide.getSelectors"}, response => 493 browser.runtime.sendMessage({type: "elemhide.getSelectors"}, response =>
502 { 494 {
503 if (this.tracer) 495 if (this.tracer)
504 this.tracer.disconnect(); 496 this.tracer.disconnect();
505 this.tracer = null; 497 this.tracer = null;
506 498
507 if (this.style && this.style.parentElement)
508 this.style.parentElement.removeChild(this.style);
509 this.style = null;
510
511 if (response.trace) 499 if (response.trace)
512 this.tracer = new ElementHidingTracer(); 500 this.tracer = new ElementHidingTracer();
513 501
514 this.inject = response.inject; 502 this.inline = response.inline;
515 503
516 if (this.inject) 504 if (this.inline)
517 this.addSelectors(response.selectors); 505 this.addSelectorsInline(response.selectors, "standard");
518 else if (this.tracer) 506
507 if (this.tracer)
519 this.tracer.addSelectors(response.selectors); 508 this.tracer.addSelectors(response.selectors);
520 509
521 this.elemHideEmulation.apply(response.emulatedPatterns); 510 this.elemHideEmulation.apply(response.emulatedPatterns);
522 }); 511 });
523 } 512 }
524 }; 513 };
525 514
526 if (document instanceof HTMLDocument) 515 if (document instanceof HTMLDocument)
527 { 516 {
528 checkSitekey(); 517 checkSitekey();
529 518
530 elemhide = new ElemHide(); 519 elemhide = new ElemHide();
531 elemhide.apply(); 520 elemhide.apply();
532 521
533 document.addEventListener("error", event => 522 document.addEventListener("error", event =>
534 { 523 {
535 checkCollapse(event.target); 524 checkCollapse(event.target);
536 }, true); 525 }, true);
537 526
538 document.addEventListener("load", event => 527 document.addEventListener("load", event =>
539 { 528 {
540 let element = event.target; 529 let element = event.target;
541 if (/^i?frame$/.test(element.localName)) 530 if (/^i?frame$/.test(element.localName))
542 checkCollapse(element); 531 checkCollapse(element);
543 }, true); 532 }, true);
544 } 533 }
534
535 window.checkCollapse = checkCollapse;
536 window.elemhide = elemhide;
537 window.typeMap = typeMap;
538 window.getURLsFromElement = getURLsFromElement;
LEFTRIGHT
« no previous file | lib/cssInjection.js » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld