Issue 3251 - Delegate processing of element hiding hits to shouldAllowAsync() so that hits show up

lib/child/contentPolicy.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 41 matching lines @@
  * Maps numerical content type IDs to strings.
  * @type Map.<number,string>
  */
 let types = new Map();
 
 /**
  * Checks whether a request should be allowed, hides it if necessary
  * @param wnd {nsIDOMWindow}
  * @param node {nsIDOMElement}
  * @param contentType {String}
- * @param location {String}
+ * @param location {String} location of the request, filter key if contentType is ELEMHIDE
  * @param [callback] {Function} If present, the request will be sent
  *                              asynchronously and callback called with the
  *                              response
  * @return {Boolean} false if the request should be blocked
  */
-function shouldAllow(window, node, contentType, location, callback)
+let shouldAllow = exports.shouldAllow = function(window, node, contentType, location, callback)
 {
   function processResponse(response)
   {
     if (typeof response == "undefined")
       return true;
 
     let {allow, collapse, hits} = response;
     for (let {frameIndex, contentType, docDomain, thirdParty, location, filter} of hits)
     {
       let context = node;
@@ skipping 29 matching lines @@
     isPrivate: isPrivate(window)
   };
   if (typeof callback == "function")
   {
     sendAsyncMessage("AdblockPlus:ShouldAllow", data, (data) => {
       callback(processResponse(data));
     });
   }
   else
     return processResponse(sendSyncMessage("AdblockPlus:ShouldAllow", data));
-}
+};
 
 /**
  * Actual nsIContentPolicy and nsIChannelEventSink implementation
  * @class
  */
 var PolicyImplementation =
 {
   classDescription: "Adblock Plus content policy",
   classID: Components.ID("cfeaabe6-1dd1-11b2-a0c6-cb5c268894c9"),
   contractID: "@adblockplus.org/abp/policy;1",
@@ skipping 231 matching lines @@
         let property = (hasCols ? "cols" : "rows");
         let weights = parentNode[property].split(",");
         weights[index] = "0";
         parentNode[property] = weights.join(",");
       }
     }
     else
       node.classList.add(collapsedClass);
   }
 }