Issue 3687 - Add experimental support for Safari content blockers

safari/ext/content.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 14 matching lines @@
 
   /* Intialization */
 
   var beforeLoadEvent = document.createEvent("Event");
   beforeLoadEvent.initEvent("beforeload");
 
   // Decide if we should use the new content blocker API or not. (Note when the
   // API is used Safari breaks the canLoad function, making it either throw an
   // exception or return true when used.)
   var usingContentBlockerAPI = true;
-  try {

[Sebastian Noack, 2016/05/12 11:12:23]

Nit: Open brace on newline.

[kzar, 2016/05/17 15:15:40]

Done.

+  try
+  {
     if (safari.self.tab.canLoad(beforeLoadEvent,
-                                {category: "usingContentBlockerAPI"}) != true)
+                                {category: "request",
+                                 payload: {type: "prefs.get",
+                                           key: "safariContentBlocker"}}) != true)
       usingContentBlockerAPI = false;
   }
-  catch (e) { };
+  catch (e)
+  {
+  }
 
   var isTopLevel;
   var isPrerendered;
   var documentId;
   function notifyFrameLoading()
   {
     isTopLevel = window == window.top;
     isPrerendered = document.visibilityState == "prerender";
     documentId = Math.random().toString().substr(2);
 
     // Notify the background page that this frame is loading, generating
     // ourselves a random documentId while we're at it. That way the background
     // page can communicate with us reliably, despite limitations in Safari's
     // extension API.
     safari.self.tab.dispatchMessage("loading",  {
       url: window.location.href,
       referrer: document.referrer,
       isTopLevel: isTopLevel,
       isPrerendered: isPrerendered,
-      documentId: documentId
+      documentId: documentId,
+      legacyAPISupported: "canLoad" in safari.self.tab &&
+                          "onbeforeload" in Element.prototype
     });
   }
 
   // We must notify the background page when this page is first loadeding (now)
   // but also when it is re-shown (if the user uses the back button to return to
   // this page in the future).
   notifyFrameLoading();
   window.addEventListener("pageshow", function(event)
   {
     if (event.persisted)
@@ skipping 70 matching lines @@
         // been prevented from loading by having their "beforeload" event
         // cancelled. That is a "load" event for blocked frames, and an "error"
         // event for other blocked elements. We need to dispatch those events
         // manually here to avoid breaking element collapsing and pages that
         // rely on those events.
         setTimeout(function()
         {
           var evt = document.createEvent("Event");
           evt.initEvent(eventName);
           event.target.dispatchEvent(evt);
-        }, 0);
+        });
       }
     }, true);
   }
 
 
   /* Context menus */
 
   document.addEventListener("contextmenu", function(event)
   {
     var element = event.srcElement;
@@ skipping 54 matching lines @@
   });
 
 
   /* Detecting extension reload/disable/uninstall (not supported on Safari) */
 
   ext.onExtensionUnloaded = {
     addListener: function() {},
     removeListener: function() {}
   };
 })();