| Left: | ||
| Right: |
| LEFT | RIGHT |
|---|---|
| 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-2016 Eyeo GmbH | 3 * Copyright (C) 2006-2016 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 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 328 }, | 328 }, |
| 329 | 329 |
| 330 disconnect: function() | 330 disconnect: function() |
| 331 { | 331 { |
| 332 document.removeEventListener("DOMContentLoaded", this.trace); | 332 document.removeEventListener("DOMContentLoaded", this.trace); |
| 333 this.observer.disconnect(); | 333 this.observer.disconnect(); |
| 334 clearTimeout(this.timeout); | 334 clearTimeout(this.timeout); |
| 335 } | 335 } |
| 336 }; | 336 }; |
| 337 | 337 |
| 338 function runInDocument(fn, arg) | 338 function runInPageContext(fn, arg) |
|
kzar
2016/08/30 13:14:09
Since this no longer takes a document argument per
Sebastian Noack
2016/09/09 14:39:50
How about runInPageContext()? No preference though
kzar
2016/09/13 12:30:01
Sounds good to me.
| |
| 339 { | 339 { |
| 340 var script = document.createElement("script"); | 340 var script = document.createElement("script"); |
| 341 script.type = "application/javascript"; | 341 script.type = "application/javascript"; |
| 342 script.async = false; | 342 script.async = false; |
| 343 script.textContent = "(" + fn + ")(" + JSON.stringify(arg) + ");"; | 343 script.textContent = "(" + fn + ")(" + JSON.stringify(arg) + ");"; |
| 344 document.documentElement.appendChild(script); | 344 document.documentElement.appendChild(script); |
| 345 document.documentElement.removeChild(script); | 345 document.documentElement.removeChild(script); |
| 346 } | 346 } |
| 347 | 347 |
| 348 // Neither Chrome[1] nor Safari allow us to intercept WebSockets, and therefore | 348 // Neither Chrome[1] nor Safari allow us to intercept WebSockets, and therefore |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 363 type: "request.websocket", | 363 type: "request.websocket", |
| 364 url: event.detail.url | 364 url: event.detail.url |
| 365 }, function (block) | 365 }, function (block) |
| 366 { | 366 { |
| 367 document.dispatchEvent( | 367 document.dispatchEvent( |
| 368 new CustomEvent(eventName + "-" + event.detail.url, {detail: block}) | 368 new CustomEvent(eventName + "-" + event.detail.url, {detail: block}) |
| 369 ); | 369 ); |
| 370 }); | 370 }); |
| 371 }); | 371 }); |
| 372 | 372 |
| 373 runInDocument(function(eventName) | 373 runInPageContext(function(eventName) |
| 374 { | 374 { |
| 375 // As far as possible we must track everything we use that could be | 375 // As far as possible we must track everything we use that could be |
| 376 // sabotaged by the website later in order to circumvent us. | 376 // sabotaged by the website later in order to circumvent us. |
| 377 var RealWebSocket = WebSocket; | 377 var RealWebSocket = WebSocket; |
| 378 var closeWebSocket = Function.prototype.call.bind(RealWebSocket.prototype.cl ose); | 378 var closeWebSocket = Function.prototype.call.bind(RealWebSocket.prototype.cl ose); |
| 379 var addEventListener = document.addEventListener.bind(document); | 379 var addEventListener = document.addEventListener.bind(document); |
| 380 var removeEventListener = document.removeEventListener.bind(document); | 380 var removeEventListener = document.removeEventListener.bind(document); |
| 381 var dispatchEvent = document.dispatchEvent.bind(document); | 381 var dispatchEvent = document.dispatchEvent.bind(document); |
| 382 var CustomEvent = window.CustomEvent; | 382 var CustomEvent = window.CustomEvent; |
| 383 | 383 |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 425 CLOSED: {value: RealWebSocket.CLOSED, enumerable: true}, | 425 CLOSED: {value: RealWebSocket.CLOSED, enumerable: true}, |
| 426 prototype: {value: RealWebSocket.prototype} | 426 prototype: {value: RealWebSocket.prototype} |
| 427 }); | 427 }); |
| 428 | 428 |
| 429 RealWebSocket.prototype.constructor = WebSocket; | 429 RealWebSocket.prototype.constructor = WebSocket; |
| 430 }, eventName); | 430 }, eventName); |
| 431 } | 431 } |
| 432 | 432 |
| 433 function ElemHide() | 433 function ElemHide() |
| 434 { | 434 { |
| 435 this.shadow = this.createShadowTree(); | 435 this.shadow = this.createShadowTree(); |
|
kzar
2016/08/30 13:14:09
I don't mind too much but perhaps this.shadow shou
Sebastian Noack
2016/09/09 14:39:51
Why adding more code just for the matter of using
kzar
2016/09/13 12:30:01
Acknowledged.
| |
| 436 this.style = null; | 436 this.style = null; |
| 437 this.tracer = null; | 437 this.tracer = null; |
| 438 | 438 |
| 439 this.propertyFilters = new CSSPropertyFilters( | 439 this.propertyFilters = new CSSPropertyFilters( |
| 440 window, | 440 window, |
| 441 function(callback) | 441 function(callback) |
| 442 { | 442 { |
| 443 ext.backgroundPage.sendMessage({ | 443 ext.backgroundPage.sendMessage({ |
| 444 type: "filters.get", | 444 type: "filters.get", |
| 445 what: "cssproperties" | 445 what: "cssproperties" |
| 446 }, callback); | 446 }, callback); |
| 447 }, | 447 }, |
| 448 this.addSelectors.bind(this) | 448 this.addSelectors.bind(this) |
| 449 ); | 449 ); |
| 450 } | 450 } |
| 451 ElemHide.prototype = { | 451 ElemHide.prototype = { |
| 452 selectorGroupSize: 200, | 452 selectorGroupSize: 200, |
| 453 | 453 |
| 454 createShadowTree: function() | 454 createShadowTree: function() |
| 455 { | 455 { |
| 456 // Use Shadow DOM if available to don't mess with web pages that rely | 456 // Use Shadow DOM if available as to not mess with with web pages that |
|
kzar
2016/08/30 13:14:09
Nit: Should be "...if available as to not mess wit
Sebastian Noack
2016/09/09 14:39:51
Done.
| |
| 457 // on the order of their own <style> tags (#309). However, creating a | 457 // rely on the order of their own <style> tags (#309). However, creating |
| 458 // shadow root breaks running CSS transitions. So we have to create | 458 // a shadow root breaks running CSS transitions. So we have to create |
| 459 // the shadow root before transistions might start (#452). | 459 // the shadow root before transistions might start (#452). |
| 460 if (!("createShadowRoot" in document.documentElement)) | 460 if (!("createShadowRoot" in document.documentElement)) |
| 461 return null; | 461 return null; |
| 462 | 462 |
| 463 // Using shadow DOM causes issues on some Google websites, | 463 // Using shadow DOM causes issues on some Google websites, |
| 464 // including Google Docs, Gmail and Blogger (#1770, #2602, #2687). | 464 // including Google Docs, Gmail and Blogger (#1770, #2602, #2687). |
| 465 if (/\.(?:google|blogger)\.com$/.test(document.domain)) | 465 if (/\.(?:google|blogger)\.com$/.test(document.domain)) |
| 466 return null; | 466 return null; |
| 467 | 467 |
| 468 var shadow = document.documentElement.createShadowRoot(); | 468 var shadow = document.documentElement.createShadowRoot(); |
|
kzar
2016/08/30 13:14:09
If we don't turn shadow into a getter perhaps we s
Sebastian Noack
2016/09/09 14:39:50
We still need to indicate whether we are using sha
kzar
2016/09/13 12:30:01
Acknowledged.
| |
| 469 shadow.appendChild(document.createElement("shadow")); | 469 shadow.appendChild(document.createElement("shadow")); |
| 470 | 470 |
| 471 // Stop the website from messing with our shadow root (#4191, #4298). | 471 // Stop the website from messing with our shadow root (#4191, #4298). |
| 472 if ("shadowRoot" in Element.prototype) | 472 if ("shadowRoot" in Element.prototype) |
| 473 { | 473 { |
| 474 runInDocument(function() | 474 runInPageContext(function() |
| 475 { | 475 { |
| 476 var ourShadowRoot = document.documentElement.shadowRoot; | 476 var ourShadowRoot = document.documentElement.shadowRoot; |
| 477 var desc = Object.getOwnPropertyDescriptor(Element.prototype, "shadowRoo t"); | 477 var desc = Object.getOwnPropertyDescriptor(Element.prototype, "shadowRoo t"); |
| 478 var shadowRoot = Function.prototype.call.bind(desc.get); | 478 var shadowRoot = Function.prototype.call.bind(desc.get); |
| 479 | 479 |
| 480 Object.defineProperty(Element.prototype, "shadowRoot", { | 480 Object.defineProperty(Element.prototype, "shadowRoot", { |
| 481 configurable: true, enumerable: true, get: function() | 481 configurable: true, enumerable: true, get: function() |
| 482 { | 482 { |
| 483 var shadow = shadowRoot(this); | 483 var shadow = shadowRoot(this); |
| 484 return shadow == ourShadowRoot ? null : shadow; | 484 return shadow == ourShadowRoot ? null : shadow; |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 592 checkCollapse(event.target); | 592 checkCollapse(event.target); |
| 593 }, true); | 593 }, true); |
| 594 | 594 |
| 595 document.addEventListener("load", function(event) | 595 document.addEventListener("load", function(event) |
| 596 { | 596 { |
| 597 var element = event.target; | 597 var element = event.target; |
| 598 if (/^i?frame$/.test(element.localName)) | 598 if (/^i?frame$/.test(element.localName)) |
| 599 checkCollapse(element); | 599 checkCollapse(element); |
| 600 }, true); | 600 }, true); |
| 601 } | 601 } |
| LEFT | RIGHT |