Issue 5464 - Upgrade to new asynchronous version of abp2blocklist

safari/ext/common.js

Index: safari/ext/common.js
===================================================================
--- a/safari/ext/common.js
+++ b/safari/ext/common.js
@@ -12,16 +12,23 @@
  * 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()
 {
+  window.addEventListener("load", () =>

[Manish Jethani, 2017/08/14 17:23:49]

We have to do this in the load handler because the classes haven't been defined
yet.

[Sebastian Noack, 2017/08/15 15:25:01]

This seems to be the wrong place to do this. If you patch RegExpFilter.typeMap
in lib/requestBlocker.js, the event listener wouldn't be necessary.

[Manish Jethani, 2017/08/16 10:23:01]

This seems to do the trick.

Done.

+  {
+    // Patch RegExpFilter.typeMap with WEBRTC, because abp2blocklist needs it
+    // and our version of core doesn't support it yet. See issue #5464.
+    require("filterClasses").RegExpFilter.typeMap.WEBRTC = 256;
+  });
+
   /* Message passing */
 
   var MessageProxy = ext._MessageProxy = function(messageDispatcher)
   {
     this._messageDispatcher = messageDispatcher;
     this._responseCallbacks = Object.create(null);
     this._responseCallbackCounter = 0;
   };