Issue 3274 - Unbreak collecting window stats

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 50 matching lines @@
  * @param {Object|undefined} response  object received as response
  * @return {Boolean} false if the request should be blocked
  */
 function processPolicyResponse(window, node, response)
 {
   if (typeof response == "undefined")
     return true;
 
   let {allow, collapse, hits} = response;
   let isObject = false;
-  for (let {frameIndex, contentType, docDomain, thirdParty, location, filter} of hits)
+  for (let hit of hits)
   {
-    if (contentType == "OBJECT")
+    if (hit.contentType == "OBJECT")
       isObject = true;
 
     let context = node;
-    if (typeof frameIndex == "number")
+    if (typeof hit.frameIndex == "number")
     {
       context = window;
-      for (let i = 0; i < frameIndex; i++)
+      for (let i = 0; i < hit.frameIndex; i++)
         context = context.parent;
       context = context.document;
     }
-    RequestNotifier.addNodeData(context, window.top, contentType, docDomain, thirdParty, location, filter);
+    RequestNotifier.addNodeData(context, window.top, hit);
   }
 
   if (node.nodeType == Ci.nsIDOMNode.ELEMENT_NODE)
   {
     // Track mouse events for objects
     if (allow && isObject)
     {
       node.addEventListener("mouseover", objectMouseEventHander, true);
       node.addEventListener("mouseout", objectMouseEventHander, true);
     }
@@ skipping 284 matching lines @@
         let property = (hasCols ? "cols" : "rows");
         let weights = parentNode[property].split(",");
         weights[index] = "0";
         parentNode[property] = weights.join(",");
       }
     }
     else
       node.classList.add(collapsedClass);
   }
 }