Issue 1801 - Use URL objects to process URLs in the background page

safari/ext/content.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 39 matching lines @@
       document.removeEventListener("visibilitychange", onVisibilitychange);
     };
     document.addEventListener("visibilitychange", onVisibilitychange);
   }
 
 
   /* Web requests */
 
   document.addEventListener("beforeload", function(event)
   {
-    var url = resolveURL(event.url);
-
     // we don't block non-HTTP requests anyway, so we can bail out
     // without asking the background page. This is even necessary
     // because passing large data (like a photo encoded as data: URL)
     // to the background page, freezes Safari.
-    if (!/^https?:/.test(url))
+    if (/^(?!https?:)[\w-]+:/.test(event.url))
       return;
 
     var type = "other";
     var eventName = "error";
 
     switch(event.target.localName)
     {
       case "frame":
       case "iframe":
         type = "sub_frame";
@@ skipping 12 matching lines @@
         break;
       case "link":
         if (/\bstylesheet\b/i.test(event.target.rel))
           type = "stylesheet";
         break;
     }
 
     if (!safari.self.tab.canLoad(
       event, {
         category: "webRequest",
-        url: url,
+        url: event.url,
         type: type,
         pageId: documentInfo.pageId,
         frameId: documentInfo.frameId
       }
     ))
     {
       event.preventDefault();
 
       // Safari doesn't dispatch the expected events for elements that have been
       // prevented from loading by having their "beforeload" event cancelled.
@@ skipping 320 matching lines @@
   });
 
 
   /* Detecting extension reload/disable/uninstall (not supported on Safari) */
 
   ext.onExtensionUnloaded = {
     addListener: function() {},
     removeListener: function() {}
   };
 })();