Issue 3208 - Separate contentPolicy module into a parent and child part

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 46 matching lines @@
  * Checks whether a request should be allowed, hides it if necessary
  * @param wnd {nsIDOMWindow}
  * @param node {nsIDOMElement}
  * @param contentType {String}
  * @param location {String}
  * @return {Boolean} false if the request should be blocked
  */
 function shouldAllow(window, node, contentType, location)
 {
   let response = sendSyncMessage("AdblockPlus:ShouldAllow", {
-    contentType: types.get(contentType),
+    contentType: contentType,
     location: location,
     frames: getFrames(window),
     isPrivate: isPrivate(window)
   });
   if (response.length == 0)
     return true;
 
-  let {allow, collapse, hits} = JSON.parse(response[0]);
+  let {allow, collapse, hits} = response[0];
   for (let {frameIndex, contentType, docDomain, thirdParty, location, filter} of hits)
   {
     let context = node;
     if (typeof frameIndex == "number")
     {
       context = window;
       for (let i = 0; i < frameIndex; i++)
         context = context.parent;
       context = context.document;
     }
@@ skipping 159 matching lines @@
         return;
 
       let wnd = Utils.getRequestWindow(newChannel);
       if (!wnd)
         return;
 
       if (contentType == Ci.nsIContentPolicy.TYPE_DOCUMENT)
       {
         if (wnd.history.length <= 1 && wnd.opener)
         {
-          // Special treatment for pop-up windows. Note that we might not have
+          // Special treatment for pop-up windows - this will close the window
+          // rather than preventing the redirect. Note that we might not have
           // seen the original channel yet because the redirect happened before
           // the async code in observe() had a chance to run.
           this.observe(wnd, "content-document-global-created", null, oldChannel.URI.spec);
           this.observe(wnd, "content-document-global-created", null, newChannel.URI.spec);
         }
         return;
       }
 
       if (!shouldAllow(wnd, wnd.document, types.get(contentType), newChannel.URI.spec))
         result = Cr.NS_BINDING_ABORTED;
@@ skipping 45 matching lines @@
 /**
  * Processes nodes scheduled for post-processing (typically hides them).
  */
 function postProcessNodes()
 {
   if (!collapsedClass)
   {
     let response = sendSyncMessage("AdblockPlus:GetCollapsedClass");
     if (response.length)
       collapsedClass = response[0];
-
-    if (!collapsedClass)
-    {
-      Utils.runAsync(postProcessNodes);
-      return;
-    }
   }
 
   let nodes = scheduledNodes;
   scheduledNodes = null;
+
+  if (!collapsedClass)
+    return;
 
   for (let node of nodes)
   {
     // adjust frameset's cols/rows for frames
     let parentNode = node.parentNode;
     if (parentNode && parentNode instanceof Ci.nsIDOMHTMLFrameSetElement)
     {
       let hasCols = (parentNode.cols && parentNode.cols.indexOf(",") > 0);
       let hasRows = (parentNode.rows && parentNode.rows.indexOf(",") > 0);
       if ((hasCols || hasRows) && !(hasCols && hasRows))
       {
         let index = -1;
         for (let frame = node; frame; frame = frame.previousSibling)
           if (frame instanceof Ci.nsIDOMHTMLFrameElement || frame instanceof Ci.nsIDOMHTMLFrameSetElement)
             index++;
 
         let property = (hasCols ? "cols" : "rows");
         let weights = parentNode[property].split(",");
         weights[index] = "0";
         parentNode[property] = weights.join(",");
       }
     }
     else
       node.classList.add(collapsedClass);
   }
 }