Issue 3687 - Add experimental support for Safari content blockers

safari/include.youtube.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/>.
  */
 
 (function() {
   if (document.domain != "www.youtube.com")
     return;
 
   var usingContentBlockerAPI = true;
-  try {

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

Nit: Open brace on new line.

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

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)
+  {
+  }
 
   if (usingContentBlockerAPI)
     return;
 
   if (ext.backgroundPage.sendMessageSync({type: "filters.isPageWhitelisted"}))
     return;
 
   var badArgumentsRegex = /^((.*_)?(ad|ads|afv|adsense)(_.*)?|(ad3|st)_module|prerolls|interstitial|infringe|iv_cta_url)$/;
 
   function rewriteFlashvars(flashvars)
@@ skipping 128 matching lines @@
               config.args = rawConfig.args;
             }
           }
         });
 
         ytplayer.config = rawYtplayer.config;
       }
     });
   }, badArgumentsRegex);
 })();