Noissue - Use suffixes function

lib/elemHide.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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/>.
  */
 
 "use strict";
 
 /**
  * @fileOverview Element hiding implementation.
  */
 
 const {ElemHideExceptions} = require("./elemHideExceptions");
 const {filterNotifier} = require("./filterNotifier");
+const {suffixes} = require("./domain");
 
 /**
  * The maximum number of selectors in a CSS rule. This is used by
  * <code>{@link createStyleSheet}</code> to split up a long list of selectors
  * into multiple rules.
  * @const {number}
  * @default
  */
 const selectorGroupSize = 1024;
 
@@ skipping 126 matching lines @@
  * @param {boolean} specificOnly Whether selectors from generic filters should
  *   be included.
  *
  * @returns {Array.<string>} The list of selectors.
  */
 function getConditionalSelectors(domain, specificOnly)
 {
   let selectors = [];
 
   let excluded = new Set();
-  let currentDomain = domain;
 
   // This code is a performance hot-spot, which is why we've made certain
   // micro-optimisations. Please be careful before making changes.
-  while (true)
+  for (let currentDomain of suffixes(domain, !specificOnly))

[hub, 2019/02/06 12:55:05]

I assume that this change doesn't cause a performance regression since this
section is labelled as being a hot spot?

[Manish Jethani, 2019/02/06 13:13:31]

This is no longer a hot spot and in fact this comment is misleading. I think we
should remove this comment. There is nothing special about this function, there
are lots of such functions where we have done optimizations.

[Manish Jethani, 2019/02/06 13:17:06]

Done.

   {
-    if (specificOnly && currentDomain == "")
-      break;
-
     let filters = filtersByDomain.get(currentDomain);
     if (filters)
     {
       for (let [filter, isIncluded] of filters)
       {
         if (!isIncluded)
         {
           excluded.add(filter);
         }
         else
         {
           let {selector} = filter;
           if ((excluded.size == 0 || !excluded.has(filter)) &&
               !ElemHideExceptions.getException(selector, domain))
           {
             selectors.push(selector);
           }
         }
       }
     }
-
-    if (currentDomain == "")
-      break;
-
-    let nextDot = currentDomain.indexOf(".");
-    currentDomain = nextDot == -1 ? "" : currentDomain.substr(nextDot + 1);
   }
 
   return selectors;
 }
 
 /**
  * Returns the default style sheet that applies on all domains.
  * @returns {string}
  */
 function getDefaultStyleSheet()
@@ skipping 300 matching lines @@
 {
   let styleSheet = "";
 
   for (let selectorGroup of splitSelectors(selectors))
     styleSheet += createRule(selectorGroup);
 
   return styleSheet;
 }
 
 exports.createStyleSheet = createStyleSheet;