Issue 4191 - Restore rules for reinjected stylesheets

include.preload.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
 var SELECTOR_GROUP_SIZE = 200;
-var id = Math.random().toString(36).substr(2);
 
 var typeMap = {
   "img": "IMAGE",
   "input": "IMAGE",
   "picture": "IMAGE",
   "audio": "MEDIA",
   "video": "MEDIA",
   "frame": "SUBDOCUMENT",
   "iframe": "SUBDOCUMENT",
   "object": "OBJECT",
@@ skipping 296 matching lines @@
   },
 
   disconnect: function()
   {
     this.document.removeEventListener("DOMContentLoaded", this.trace);
     this.observer.disconnect();
     clearTimeout(this.timeout);
   }
 };
 
-function runInPage(fn, arg)
+function runInDocument(document, fn, arg)
 {
   var script = document.createElement("script");
   script.type = "application/javascript";
   script.async = false;
   script.textContent = "(" + fn + ")(" + JSON.stringify(arg) + ");";
   document.documentElement.appendChild(script);
   document.documentElement.removeChild(script);
 }
 
 // Neither Chrome[1] nor Safari allow us to intercept WebSockets, and therefore
 // some ad networks are misusing them as a way to serve adverts and circumvent
 // us. As a workaround we wrap WebSocket, preventing blocked WebSocket
 // connections from being opened.
 // [1] - https://bugs.chromium.org/p/chromium/issues/detail?id=129353
-function wrapWebSocket()
+function wrapWebSocket(document)
 {
   if (typeof WebSocket == "undefined")
     return;
 
-  var eventName = "abpws-" + id;
+  var eventName = "abpws-" + Math.random().toString(36).substr(2);
 
   document.addEventListener(eventName, function(event)
   {
     ext.backgroundPage.sendMessage({
       type: "websocket-request",
       url: event.detail.url
     }, function (block)
     {
       document.dispatchEvent(
         new CustomEvent(eventName + "-" + event.detail.url, {detail: block})
       );
     });
   });
 
-  runInPage(function(eventName)
+  runInDocument(document, function(eventName)
   {
     // As far as possible we must track everything we use that could be
     // sabotaged by the website later in order to circumvent us.
     var RealWebSocket = WebSocket;
     var closeWebSocket = Function.prototype.call.bind(RealWebSocket.prototype.close);
     var addEventListener = document.addEventListener.bind(document);
     var removeEventListener = document.removeEventListener.bind(document);
     var dispatchEvent = document.dispatchEvent.bind(document);
     var CustomEvent = window.CustomEvent;
 
@@ skipping 41 matching lines @@
   }, eventName);
 }
 
 function init(document)
 {
   var shadow = null;
   var style = null;
   var observer = null;
   var tracer = null;
 
-  wrapWebSocket();
+  wrapWebSocket(document);
 
   function getPropertyFilters(callback)
   {
     ext.backgroundPage.sendMessage({
       type: "filters.get",
       what: "cssproperties"
     }, callback);
   }
   var propertyFilters = new CSSPropertyFilters(window, getPropertyFilters,
                                                addElemHideSelectors);
 
   // Use Shadow DOM if available to don't mess with web pages that rely on
   // the order of their own <style> tags (#309).
   //
   // However, creating a shadow root breaks running CSS transitions. So we
   // have to create the shadow root before transistions might start (#452).
   //
   // Also, using shadow DOM causes issues on some Google websites,
   // including Google Docs, Gmail and Blogger (#1770, #2602, #2687).
   if ("createShadowRoot" in document.documentElement &&
       !/\.(?:google|blogger)\.com$/.test(document.domain))
   {
     shadow = document.documentElement.createShadowRoot();
     shadow.appendChild(document.createElement("shadow"));
 
     // Stop the website from messing with our shadowRoot
-    runInPage(function()

[Sebastian Noack, 2016/08/11 12:48:11]

You have to pass the document to runInPage(), to make sure that it gets injected
into the right document.

[kzar, 2016/08/11 13:04:46]

Done.

+    runInDocument(document, function()
     {
       var ourShadowRoot = document.documentElement.shadowRoot;
       var desc = Object.getOwnPropertyDescriptor(Element.prototype, "shadowRoot");
       var shadowRoot = Function.prototype.call.bind(desc.get);
 
       Object.defineProperty(Element.prototype, "shadowRoot", {
         conifgurable: true, enumerable: true, get: function()
         {
           var shadow = shadowRoot(this);
-          return shadow === ourShadowRoot ? null : shadow;

[Sebastian Noack, 2016/08/11 12:38:57]

Nit: As per Mozilla's coding practices, we prefer === over ==.

[Sebastian Noack, 2016/08/11 12:42:37]

(The other way around, I meant, == is preferred over ===)

[kzar, 2016/08/11 12:48:18]

Done.

+          return shadow == ourShadowRoot ? null : shadow;
         }
       });
-    }, "");

[Sebastian Noack, 2016/08/11 12:38:57]

Nit: I'd rather pass null, than creating an empty string.

[kzar, 2016/08/11 12:48:18]

Done.

+    }, null);
   }
 
   function addElemHideSelectors(selectors)
   {
     if (selectors.length == 0)
       return;
 
     if (!style)
     {
       // Create <style> element lazily, only if we add styles. Add it to
@@ skipping 124 matching lines @@
   }, true);
 
   return updateStylesheet;
 }
 
 if (document instanceof HTMLDocument)
 {
   checkSitekey();
   window.updateStylesheet = init(document);
 }