Removed Do-Not-Track handling

lib/matcher.js

 /*
  * This file is part of the Adblock Plus,
  * Copyright (C) 2006-2012 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 90 matching lines @@
     delete this.keywordByFilter[filter.text];
   },
 
   /**
    * Chooses a keyword to be associated with the filter
    * @param {String} text text representation of the filter
    * @return {String} keyword (might be empty string)
    */
   findKeyword: function(filter)
   {
-    // For donottrack filters use "donottrack" as keyword if nothing else matches
-    let defaultResult = (filter.contentType & RegExpFilter.typeMap.DONOTTRACK ? "donottrack" : "");
-
+    let result = "";
     let text = filter.text;
     if (Filter.regexpRegExp.test(text))
-      return defaultResult;
+      return result;
 
     // Remove options
     let match = Filter.optionsRegExp.exec(text);
     if (match)
       text = match.input.substr(0, match.index);
 
     // Remove whitelist marker
     if (text.substr(0, 2) == "@@")
       text = text.substr(2);
 
     let candidates = text.toLowerCase().match(/[^a-z0-9%*][a-z0-9%]{3,}(?=[^a-z0-9%*])/g);
     if (!candidates)
-      return defaultResult;
+      return result;
 
     let hash = this.filterByKeyword;
-    let result = defaultResult;
     let resultCount = 0xFFFFFF;
     let resultLength = 0;
     for (let i = 0, l = candidates.length; i < l; i++)
     {
       let candidate = candidates[i].substr(1);
       let count = (candidate in hash ? hash[candidate].length : 0);
       if (count < resultCount || (count == resultCount && candidate.length > resultLength))
       {
         result = candidate;
         resultCount = count;
@@ skipping 43 matching lines @@
    * @param {String} contentType content type identifier of the URL
    * @param {String} docDomain domain name of the document that loads the URL
    * @param {Boolean} thirdParty should be true if the URL is a third-party request
    * @return {RegExpFilter} matching filter or null
    */
   matchesAny: function(location, contentType, docDomain, thirdParty)
   {
     let candidates = location.toLowerCase().match(/[a-z0-9%]{3,}/g);
     if (candidates === null)
       candidates = [];
-    if (contentType == "DONOTTRACK")
-      candidates.unshift("donottrack");
-    else
-      candidates.push("");
+    candidates.push("");
     for (let i = 0, l = candidates.length; i < l; i++)
     {
       let substr = candidates[i];
       if (substr in this.filterByKeyword)
       {
         let result = this._checkEntryMatch(substr, location, contentType, docDomain, thirdParty);
         if (result)
           return result;
       }
     }
@@ skipping 164 matching lines @@
   /**
    * Optimized filter matching testing both whitelist and blacklist matchers
    * simultaneously. For parameters see Matcher.matchesAny().
    * @see Matcher#matchesAny
    */
   matchesAnyInternal: function(location, contentType, docDomain, thirdParty)
   {
     let candidates = location.toLowerCase().match(/[a-z0-9%]{3,}/g);
     if (candidates === null)
       candidates = [];
-    if (contentType == "DONOTTRACK")
-      candidates.unshift("donottrack");
-    else
-      candidates.push("");
+    candidates.push("");
 
     let blacklistHit = null;
     for (let i = 0, l = candidates.length; i < l; i++)
     {
       let substr = candidates[i];
       if (substr in this.whitelist.filterByKeyword)
       {
         let result = this.whitelist._checkEntryMatch(substr, location, contentType, docDomain, thirdParty);
         if (result)
           return result;
@@ skipping 44 matching lines @@
     else
       return null;
   }
 }
 
 /**
  * Shared CombinedMatcher instance that should usually be used.
  * @type CombinedMatcher
  */
 let defaultMatcher = exports.defaultMatcher = new CombinedMatcher();