issue #362 - firefox: block image broken on youtube thumbnails (recommended videos)

lib/requestNotifier.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 223 matching lines @@
  * @param {Boolean} noParent  if missing or false, the search will extend to the parent nodes until one is found that has data associated with it
  * @param {Integer} [type] request type to be looking for
  * @param {String} [location] request location to be looking for
  * @result {[Node, RequestEntry]}
  * @static
  */
 RequestNotifier.getDataForNode = function(node, noParent, type, location)
 {
   while (node)
   {
-    let data = getEntry(nodeData, node);
-    if (typeof data != "undefined")
+    let entry = getEntry(nodeData, node);
+    if (typeof entry != "undefined" &&
+        (typeof type == "undefined" || entry.type == type) &&
+        (typeof location == "undefined" || entry.location == location))
     {
-      // Look for matching entry
-      for (let k in data)
-      {
-        let entry = data[k];
-        if ((typeof type == "undefined" || entry.type == type) &&
-            (typeof location == "undefined" || entry.location == location))
-        {
-          return [node, entry];
-        }
-      }
+      return [node, entry];
     }
 
     // If we don't have any match on this node then maybe its parent will do
     if ((typeof noParent != "boolean" || !noParent) &&
         node.parentNode instanceof Ci.nsIDOMElement)
     {
       node = node.parentNode;
     }
     else
     {
@@ skipping 91 matching lines @@
   get localizedDescr()
   {
     return require("contentPolicy").Policy.localizedDescr[this.type];
   },
 
   /**
    * Attaches this request object to a DOM node.
    */
   attachToNode: function(/**Node*/ node)
   {
-    let existingData = getEntry(nodeData, node);
-    if (typeof existingData == "undefined")
-    {
-      existingData = {};
-      setEntry(nodeData, node, existingData);
-    }
-
-    // Add this request to the node data
-    existingData[this.type + " " + this.location] = this;
+    setEntry(nodeData, node, this);

[Wladimir Palant, 2014/08/14 20:44:57]

The the list of blockable items is broken now because startScan() method isn't
working correctly.

We do need to save all the requests that we receive for a node. This is
especially true for the document node which will be associated with numerous
requests (e.g. XMLHttpRequests or background images).

I suggest adding a RequestEntry.id property which will simply increase with each
new object created:

  function RequestEntry(...)
  {
    this.id = ++maxId;

RequestNotifier.getDataForNode() should then return whichever matching entry has
the highest ID.

[saroyanm, 2014/08/17 14:25:21]

Oops, Thanks for that.

   }
 };