Issue 3258 - Blockable items: fix Size column

lib/child/requestNotifier.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 62 matching lines @@
   let {notifierID, responseID, requests} = message.data;
   let notifier = notifiers.get(notifierID);
   if (notifier)
     notifier.retrieveNodeSize(requests, responseID);
 }
 
 /**
  * Creates a notifier object for a particular window. After creation the window
  * will first be scanned for previously saved requests. Once that scan is
  * complete only new requests for this window will be reported.
- * @param {Window} wnd  window to attach the notifier to
- * @param {Integer} id  Parent notifier ID to be messaged
+ * @param {Window} window  window to attach the notifier to
+ * @param {Integer} notifierID  Parent notifier ID to be messaged
  */
 function RequestNotifier(window, notifierID)
 {
   this.window = window;
   this.id = notifierID;
   notifiers.set(this.id, this);
   this.nodes = new Map();
   this.startScan(window);
 }
 exports.RequestNotifier = RequestNotifier;
@@ skipping 60 matching lines @@
    * Starts the initial scan of the window (will recurse into frames).
    * @param {Window} wnd  the window to be scanned
    */
   startScan: function(wnd)
   {
     let doc = wnd.document;
     let walker = doc.createTreeWalker(doc, Ci.nsIDOMNodeFilter.SHOW_ELEMENT, null, false);
 
     let process = function()
     {
+      // Don't do anything if the notifier was shut down already.
       if (!this.window)
         return;
 
       let node = walker.currentNode;
       let data = nodeData.get(node);
       if (typeof data != "undefined")
         for (let k in data)
           this.notifyListener(node, data[k]);
 
       if (walker.nextNode())
@@ skipping 15 matching lines @@
 
     // Process each node in a separate event to allow other events to process
     this.eventsPosted++;
     Utils.runAsync(process);
   },
 
   /**
    * Makes the nodes associated with the given requests blink.
    * @param {number[]} requests  list of request IDs that were previously
    *                             reported by this notifier.
-   * @param {Boolean} scrollToItem  if true, scroll to first node
+   * @param {boolean} scrollToItem  if true, scroll to first node
    */
   flashNodes: function(requests, scrollToItem)
   {
     this.stopFlashing();
 
     let nodes = [];
     for (let id of requests)
     {
+      if (!this.nodes.has(id))
+        continue;
+
       let node = this.nodes.get(id);
-      if (typeof node != "undefined" && node.nodeType == Ci.nsIDOMNode.ELEMENT_NODE)
+      if (Cu.isDeadWrapper(node))
+        this.nodes.delete(node);
+      else if (node.nodeType == Ci.nsIDOMNode.ELEMENT_NODE)
         nodes.push(node);
     }
     if (nodes.length)
       this.flasher = new Flasher(nodes, scrollToItem);
   },
 
   /**
    * Stops flashing nodes after a previous flashNodes() call.
    */
   stopFlashing: function()
   {
     if (this.flasher)
       this.flasher.stop();
     this.flasher = null;
   },
 
   /**
    * Attempts to calculate the size of the nodes associated with the requests,
    * Sends message to parent when complete.
    * @param {number[]} requests  list of request IDs that were previously
    *                             reported by this notifier.
    * @param {number} responseID  ID to be sent with the response.
    */
   retrieveNodeSize: function(requests, responseID)
   {
     function getNodeSize(node)
     {
-      if (typeof node != "undefined" && !Cu.isDeadWrapper(node))
-      {
-        if (node instanceof Ci.nsIDOMHTMLImageElement && (node.naturalWidth || node.naturalHeight))
-          return [node.naturalWidth, node.naturalHeight];
-        else if (node instanceof Ci.nsIDOMHTMLElement && (node.offsetWidth || node.offsetHeight))
-          return [node.offsetWidth, node.offsetHeight];
-      }
-      return null;
+      if (node instanceof Ci.nsIDOMHTMLImageElement && (node.naturalWidth || node.naturalHeight))
+        return [node.naturalWidth, node.naturalHeight];
+      else if (node instanceof Ci.nsIDOMHTMLElement && (node.offsetWidth || node.offsetHeight))
+        return [node.offsetWidth, node.offsetHeight];
+      else
+        return null;
     }
 
     let size = null;
     for (let id of requests)
     {
-      size = getNodeSize(this.nodes.get(id));
-      if (size)
-        break;
+      if (!this.nodes.has(id))
+        continue;
+
+      let node = this.nodes.get(id);
+      if (Cu.isDeadWrapper(node))
+        this.nodes.delete(node);
+      else
+      {
+        size = getNodeSize(node);
+        if (size)
+          break;
+      }
     }
     sendAsyncMessage("AdblockPlus:RetrieveNodeSizeResponse", {
       notifierID: this.id,
       responseID,
       size
     });
   }
 };
 
 /**
  * Attaches request data to a DOM node.
  * @param {Node} node   node to attach data to
  * @param {Window} topWnd   top-level window the node belongs to
- * @param {String} contentType   request type, e.g. "IMAGE"
- * @param {String} docDomain  domain of the document that initiated the request
- * @param {Boolean} thirdParty  will be true if a third-party server has been requested
- * @param {String} location   the address that has been requested
- * @param {Filter} filter   filter applied to the request or null if none
- */
-RequestNotifier.addNodeData = function(node, topWnd, contentType, docDomain, thirdParty, location, filter)
+ * @param {Object} hitData
+ * @param {String} hitData.contentType   request type, e.g. "IMAGE"
+ * @param {String} hitData.docDomain  domain of the document that initiated the request
+ * @param {Boolean} hitData.thirdParty  will be true if a third-party server has been requested
+ * @param {String} hitData.location   the address that has been requested
+ * @param {String} hitData.filter   filter applied to the request or null if none
+ * @param {String} hitData.filterType  type of filter applied to the request
+ */
+RequestNotifier.addNodeData = function(node, topWnd, {contentType, docDomain, thirdParty, location, filter, filterType})
 {
   let entry = {
     id: ++requestEntryMaxId,
     type: contentType,
     docDomain, thirdParty, location, filter
   };
 
   let existingData = nodeData.get(node);
   if (typeof existingData == "undefined")
   {
@@ skipping 10 matching lines @@
     windowStats.set(topWnd.document, {
       items: 0,
       hidden: 0,
       blocked: 0,
       whitelisted: 0,
       filters: {}
     });
   }
 
   let stats = windowStats.get(topWnd.document);
-  let filterType = (filter ? filter.type : null);
   if (filterType != "elemhide" && filterType != "elemhideexception" && filterType != "cssproperty")
     stats.items++;
   if (filter)
   {
     if (filterType == "blocking")
       stats.blocked++;
     else if (filterType == "whitelist" || filterType == "elemhideexception")
       stats.whitelisted++;
     else if (filterType == "elemhide" || filterType == "cssproperty")
       stats.hidden++;
 
-    if (filter.text in stats.filters)
-      stats.filters[filter.text]++;
+    if (filter in stats.filters)
+      stats.filters[filter]++;
     else
-      stats.filters[filter.text] = 1;
+      stats.filters[filter] = 1;
   }
 
   // Notify listeners
   for (let notifier of notifiers.values())
     if (!notifier.window || notifier.window == topWnd)
       notifier.notifyListener(node, entry);
 }