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 301 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);

[Thomas Greiner, 2015/11/11 16:52:33]

I'd suggest either stopping this loop at some point or introducing an
exponentially increasing timeout so that in case we're - for whatever reason -
not getting a collapsed class back that it wouldn't lead to an infinite loop but
instead only to elements not getting collapsed.

[Wladimir Palant, 2015/11/11 17:43:25]

Actually, that's a left-over from a previous version of this code - the parent
will set collapsedClass synchronously, so there is no scenario where retrying
makes sense.

[Thomas Greiner, 2015/11/11 18:07:32]

Ah, you're right.

-      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);
   }
 }