Fixes 4328 - Multiple shadowRoot deprecated warnings

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
@@ skipping 344 matching lines @@
 function wrapWebSocket(document)
 {
   if (typeof WebSocket == "undefined")
     return;
 
   var eventName = "abpws-" + Math.random().toString(36).substr(2);
 
   document.addEventListener(eventName, function(event)
   {
     ext.backgroundPage.sendMessage({
-      type: "websocket-request",
+      type: "request.websocket",
       url: event.detail.url
     }, function (block)
     {
       document.dispatchEvent(
         new CustomEvent(eventName + "-" + event.detail.url, {detail: block})
       );
     });
   });
 
   runInDocument(document, function(eventName)
@@ skipping 15 matching lines @@
         callback(event.detail);
         removeEventListener(incomingEventName, listener);
       }
       addEventListener(incomingEventName, listener);
 
       dispatchEvent(new CustomEvent(eventName, {
         detail: {url: url}
       }));
     }
 
-    WebSocket = function WrappedWebSocket(url, protocols)
+    function WrappedWebSocket(url)
     {
       // Throw correct exceptions if the constructor is used improperly.
       if (!(this instanceof WrappedWebSocket)) return RealWebSocket();
       if (arguments.length < 1) return new RealWebSocket();
 
       var websocket;
       if (arguments.length == 1)
         websocket = new RealWebSocket(url);
       else
-        websocket = new RealWebSocket(url, protocols);
+        websocket = new RealWebSocket(url, arguments[1]);
 
       checkRequest(websocket.url, function(blocked)
       {
         if (blocked)
           closeWebSocket(websocket);
       });
 
       return websocket;
-    }.bind();
-
+    }
+    WrappedWebSocket.prototype = RealWebSocket.prototype;
+    WebSocket = WrappedWebSocket.bind();
     Object.defineProperties(WebSocket, {
       CONNECTING: {value: RealWebSocket.CONNECTING, enumerable: true},
       OPEN: {value: RealWebSocket.OPEN, enumerable: true},
       CLOSING: {value: RealWebSocket.CLOSING, enumerable: true},
       CLOSED: {value: RealWebSocket.CLOSED, enumerable: true},
       prototype: {value: RealWebSocket.prototype}
     });
 
     RealWebSocket.prototype.constructor = WebSocket;
   }, eventName);
@@ skipping 20 matching lines @@
 
   // 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).
   //
-  // Finally since some users have both AdBlock and Adblock Plus installed at
-  // once we have to be careful not to create the shadowRoot twice!
+  // Finally since some users have both AdBlock and Adblock Plus installed we
+  // have to consider how the two extensions interact. For example we want to
+  // avoid creating the shadowRoot twice.
   if ("createShadowRoot" in document.documentElement &&
-      !/\.(?:google|blogger)\.com$/.test(document.domain) &&
-      !document.documentElement.shadowRoot)
-  {
-    shadow = document.documentElement.createShadowRoot();
+      !/\.(?:google|blogger)\.com$/.test(document.domain))
+  {
+    shadow = document.documentElement.shadowRoot ||
+             document.documentElement.createShadowRoot();
     shadow.appendChild(document.createElement("shadow"));
 
     // Stop the website from messing with our shadowRoot
     if ("shadowRoot" in Element.prototype)
     {
       runInDocument(document, function()
       {
         var ourShadowRoot = document.documentElement.shadowRoot;
+        if (!ourShadowRoot)
+          return;
         var desc = Object.getOwnPropertyDescriptor(Element.prototype, "shadowRoot");
         var shadowRoot = Function.prototype.call.bind(desc.get);
 
         Object.defineProperty(Element.prototype, "shadowRoot", {
           configurable: true, enumerable: true, get: function()
           {
             var shadow = shadowRoot(this);
             return shadow == ourShadowRoot ? null : shadow;
           }
         });
@@ skipping 127 matching lines @@
   }, true);
 
   return updateStylesheet;
 }
 
 if (document instanceof HTMLDocument)
 {
   checkSitekey();
   window.updateStylesheet = init(document);
 }