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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
  * @fileOverview Stores Adblock Plus data to be attached to a window.
  */
 
 Cu.import("resource://gre/modules/Services.jsm");
 
 let {Utils} = require("utils");
 let {BlockingFilter, WhitelistFilter, ElemHideBase, ElemHideFilter, ElemHideException} = require("filterClasses");
 
 let nodeData = new WeakMap();
 let windowStats = new WeakMap();
 let windowSelection = new WeakMap();
+let requestEntryMaxId = 0;
 
 let setEntry, hasEntry, getEntry;
 // Last issue(Bug 982561) preventing us from using WeakMap fixed for FF version 32
 if (Services.vc.compare(Utils.platformVersion, "32.0a1") >= 0)
 {
   setEntry = (map, key, value) => map.set(key, value);
   hasEntry = (map, key) => map.has(key);
   getEntry = (map, key) => map.get(key);
 }
 else
@@ skipping 197 matching lines @@
  * @result {[Node, RequestEntry]}
  * @static
  */
 RequestNotifier.getDataForNode = function(node, noParent, type, location)
 {
   while (node)
   {
     let data = getEntry(nodeData, node);
     if (typeof data != "undefined")
     {
+      let entry = null;
       // 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))
+        if ((!entry || entry.id < data[k].id) &&
+            (typeof type == "undefined" || data[k].type == type) &&
+            (typeof location == "undefined" || data[k].location == location))
         {
-          return [node, entry];
+          entry = data[k];
         }
       }
+      if (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
     {
       node = null;
     }
   }
 
   return null;
 };
 
 function RequestEntry(node, topWnd, contentType, docDomain, thirdParty, location, filter)
 {
   this.type = contentType;
   this.docDomain = docDomain;
   this.thirdParty = thirdParty;
   this.location = location;
   this.filter = filter;
+  this.id = ++requestEntryMaxId;
 
   this.attachToNode(node);
 
   // Update window statistics
   if (!hasEntry(windowStats, topWnd.document))
   {
     setEntry(windowStats, topWnd.document, {
       items: 0,
       hidden: 0,
       blocked: 0,
@@ skipping 21 matching lines @@
   }
 
   // Notify listeners
   for (let notifier of activeNotifiers)
     if (!notifier.window || notifier.window == topWnd)
       notifier.notifyListener(topWnd, node, this);
 }
 RequestEntry.prototype =
 {
   /**
+   * id of request (used to determine last entry attached to a node)
+   * @type integer
+   */
+  id: 0,
+  /**
    * Content type of the request (one of the nsIContentPolicy constants)
    * @type Integer
    */
   type: null,
   /**
    * Domain name of the requesting document
    * @type String
    */
   docDomain: null,
   /**
@@ skipping 37 matching lines @@
     if (typeof existingData == "undefined")
     {
       existingData = {};
       setEntry(nodeData, node, existingData);
     }
 
     // Add this request to the node data
     existingData[this.type + " " + this.location] = this;
   }
 };