Issue 3208 - Don`t use numerical content types outside nsIContentPolicy.shouldLoad

lib/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 191 matching lines @@
   if (hasEntry(windowSelection, wnd.document))
     return getEntry(windowSelection, wnd.document);
   else
     return null;
 };
 
 /**
  * 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 {Integer} contentType   request type, one of the Policy.type.* constants
+ * @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*/ node, /**Window*/ topWnd, /**Integer*/ contentType, /**String*/ docDomain, /**Boolean*/ thirdParty, /**String*/ location, /**Filter*/ filter)
+RequestNotifier.addNodeData = function(/**Node*/ node, /**Window*/ topWnd, /**String*/ contentType, /**String*/ docDomain, /**Boolean*/ thirdParty, /**String*/ location, /**Filter*/ filter)

[Thomas Greiner, 2015/11/02 18:54:37]

Detail: The inline documentation here is highly redundant.

[Wladimir Palant, 2015/11/03 11:26:49]

True, this aspect of my original patch got lost. Will improve JSDoc comments in
a separate commit.

 {
   return new RequestEntry(node, topWnd, contentType, docDomain, thirdParty, location, filter);
 }
 
 /**
  * Retrieves the statistics for a window.
  * @result {Object} Object with the properties items, blocked, whitelisted, hidden, filters containing statistics for the window (might be null)
  */
 RequestNotifier.getWindowStatistics = function(/**Window*/ wnd)
 {
@@ skipping 96 matching lines @@
       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
+   * Content type of the request, e.g. "IMAGE"
+   * @type String
    */
   type: null,
   /**
    * Domain name of the requesting document
    * @type String
    */
   docDomain: null,
   /**
    * True if the request goes to a different domain than the domain of the containing document
    * @type Boolean
    */
   thirdParty: false,
   /**
    * Address being requested
    * @type String
    */
   location: null,
   /**
    * Filter that was applied to this request (if any)
    * @type Filter
    */
   filter: null,
   /**
    * String representation of the content type, e.g. "subdocument"
    * @type String
    */
   get typeDescr()
   {
-    return require("contentPolicy").Policy.typeDescr[this.type];
+    return this.type;
   },
   /**
    * User-visible localized representation of the content type, e.g. "frame"
    * @type String
    */
   get localizedDescr()
   {
-    return require("contentPolicy").Policy.localizedDescr[this.type];
+    return require("contentPolicy").Policy.localizedDescr.get(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;
   }
 };