Issue 524 - Stop using @-moz-document

lib/contentPolicy.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 12 matching lines @@
 
 let {XPCOMUtils} = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
 let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
 
 let {Utils} = require("utils");
 let {port} = require("messaging");
 let {Prefs} = require("prefs");
 let {FilterStorage} = require("filterStorage");
 let {BlockingFilter, WhitelistFilter, RegExpFilter} = require("filterClasses");
 let {defaultMatcher} = require("matcher");
-let {ElemHide} = require("elemHide");
 
 /**
  * Public policy checking functions and auxiliary objects
  * @class
  */
 var Policy = exports.Policy =
 {
   /**
    * Map of content types reported by Firefox to the respecitve content types
    * used by Adblock Plus. Other content types are simply mapped to OTHER.
@@ skipping 62 matching lines @@
     onShutdown.add(() =>
     {
       Utils.styleService.unregisterSheet(collapseStyle, Ci.nsIStyleSheetService.USER_SHEET);
     });
   },
 
   /**
    * Checks whether a node should be blocked, hides it if necessary
    * @param {Object} data  request data
    * @param {String} data.contentType
-   * @param {String} data.location  location of the request, filter key if contentType is ELEMHIDE
+   * @param {String} data.location  location of the request

[kzar, 2016/10/06 13:02:32]

FWIW I'm happy to see this change, I remember this code being really confusing
the first time I needed to change it.

    * @param {Object[]} data.frames
    * @param {Boolean} data.isPrivate  true if the request belongs to a private browsing window
    * @return {Object} An object containing properties allow, collapse and hits
    *                  indicating how this request should be handled.
    */
   shouldAllow: function({contentType, location, frames, isPrivate})
   {
     let hits = [];
 
     function addHit(frameIndex, contentType, docDomain, thirdParty, location, filter)
@@ skipping 16 matching lines @@
     if (!this.isBlockableScheme(location))
       return response(true, false);
 
     // Interpret unknown types as "other"
     contentType = this.contentTypes.get(contentType) || "OTHER";
 
     let nogeneric = false;
     if (Prefs.enabled)
     {
       let whitelistHit =
-          this.isFrameWhitelisted(frames, contentType == "ELEMHIDE");
+          this.isFrameWhitelisted(frames, false);
       if (whitelistHit)
       {
         let [frameIndex, matchType, docDomain, thirdParty, location, filter] = whitelistHit;
         addHit(frameIndex, matchType, docDomain, thirdParty, location, filter);
-        if (matchType == "DOCUMENT" || matchType == "ELEMHIDE")
+        if (matchType == "DOCUMENT")
           return response(true, false);
         else
           nogeneric = true;
       }
     }
 
     let match = null;
     let wndLocation = frames[0].location;
     let docDomain = getHostname(wndLocation);
     let [sitekey, sitekeyFrame] = getSitekey(frames);
-    if (contentType == "ELEMHIDE")
-    {
-      match = ElemHide.getFilterByKey(location);
-      location = match.text.replace(/^.*?#/, '#');
 
-      if (!match.isActiveOnDomain(docDomain))
-        return response(true, false);
-
-      let exception = ElemHide.getException(match, docDomain);
-      if (exception)
-      {
-        addHit(null, contentType, docDomain, false, location, exception);
-        return response(true, false);
-      }
-
-      if (nogeneric && match.isGeneric())
-        return response(true, false);
-    }
-
-    let thirdParty = (contentType == "ELEMHIDE" ? false : isThirdParty(location, docDomain));
+    let thirdParty = isThirdParty(location, docDomain);
     let collapse = false;
     if (!match && Prefs.enabled && RegExpFilter.typeMap.hasOwnProperty(contentType))
     {
       match = defaultMatcher.matchesAny(location, RegExpFilter.typeMap[contentType],
                                         docDomain, thirdParty, sitekey, nogeneric);
       if (match instanceof BlockingFilter && !this.nonVisualTypes.has(contentType))
         collapse = (match.collapse != null ? match.collapse : !Prefs.fastcollapse);
     }
     addHit(null, contentType, docDomain, thirdParty, location, match);
 
@@ skipping 225 matching lines @@
   {
     // EffectiveTLDService throws on IP addresses, just compare the host name
     let host = "";
     try
     {
       host = uri.host;
     } catch (e) {}
     return host != docDomain;
   }
 }