Issue 3687 - Add experimental support for Safari content blockers

safari/include.youtube.js

Index: safari/include.youtube.js
diff --git a/safari/include.youtube.js b/safari/include.youtube.js
index 0ad0bc2ed4011681293b8d23dfd01c25a38c9352..25db15e8d80c1da8310a90f637d6033efeced08b 100644
--- a/safari/include.youtube.js
+++ b/safari/include.youtube.js
@@ -19,6 +19,20 @@
   if (document.domain != "www.youtube.com")
     return;
 
+  var usingContentBlockerAPI = true;
+  try
+  {
+    if (safari.self.tab.canLoad(beforeLoadEvent,
+                                {category: "request",
+                                 payload: {type: "prefs.get",
+                                           key: "safariContentBlocker"}}) != true)
+      usingContentBlockerAPI = false;
+  }
+  catch (e) { };

[Sebastian Noack, 2016/05/17 18:35:26]

Nit: Redundant semicolon.

Also I wonder whether we should put those braces on new lines. I think our
coding style actually requires it, but I wouldn't insist.

(Both, same for the code in safari/ext/content.js)

[kzar, 2016/05/17 19:20:23]

Done.

+
+  if (usingContentBlockerAPI)
+    return;
+
   if (ext.backgroundPage.sendMessageSync({type: "filters.isPageWhitelisted"}))
     return;
 
@@ -33,7 +47,7 @@
     return pairs.join("&");
   }
 
-  function patchPlayer(player) 
+  function patchPlayer(player)
   {
     var newPlayer = player.cloneNode(true);
     var flashvarsChanged = false;