Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: lib/elemHide.js

Issue 29774573: Issue 6652 - Do not push to unconditional selectors array (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Created May 8, 2018, 4:53 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-present eyeo GmbH 3 * Copyright (C) 2006-present eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 * @param {number} [criteria] 239 * @param {number} [criteria]
240 * One of the following: ElemHide.ALL_MATCHING, ElemHide.NO_UNCONDITIONAL or 240 * One of the following: ElemHide.ALL_MATCHING, ElemHide.NO_UNCONDITIONAL or
241 * ElemHide.SPECIFIC_ONLY. 241 * ElemHide.SPECIFIC_ONLY.
242 * @returns {string[]} 242 * @returns {string[]}
243 * List of selectors. 243 * List of selectors.
244 */ 244 */
245 getSelectorsForDomain(domain, criteria) 245 getSelectorsForDomain(domain, criteria)
246 { 246 {
247 let selectors = []; 247 let selectors = [];
248 248
249 let unconditionalSelectors = null;
250
249 if (typeof criteria == "undefined") 251 if (typeof criteria == "undefined")
250 criteria = ElemHide.ALL_MATCHING; 252 criteria = ElemHide.ALL_MATCHING;
251 if (criteria < ElemHide.NO_UNCONDITIONAL) 253 if (criteria < ElemHide.NO_UNCONDITIONAL)
252 selectors = this.getUnconditionalSelectors(); 254 unconditionalSelectors = this.getUnconditionalSelectors();
253 255
254 let specificOnly = (criteria >= ElemHide.SPECIFIC_ONLY); 256 let specificOnly = (criteria >= ElemHide.SPECIFIC_ONLY);
255 let excluded = new Set(); 257 let excluded = new Set();
256 let currentDomain = domain ? domain.toUpperCase() : ""; 258 let currentDomain = domain ? domain.toUpperCase() : "";
257 259
258 // This code is a performance hot-spot, which is why we've made certain 260 // This code is a performance hot-spot, which is why we've made certain
259 // micro-optimisations. Please be careful before making changes. 261 // micro-optimisations. Please be careful before making changes.
260 while (true) 262 while (true)
261 { 263 {
262 if (specificOnly && currentDomain == "") 264 if (specificOnly && currentDomain == "")
(...skipping 16 matching lines...) Expand all
279 } 281 }
280 } 282 }
281 283
282 if (currentDomain == "") 284 if (currentDomain == "")
283 break; 285 break;
284 286
285 let nextDot = currentDomain.indexOf("."); 287 let nextDot = currentDomain.indexOf(".");
286 currentDomain = nextDot == -1 ? "" : currentDomain.substr(nextDot + 1); 288 currentDomain = nextDot == -1 ? "" : currentDomain.substr(nextDot + 1);
287 } 289 }
288 290
291 if (unconditionalSelectors)
292 selectors = unconditionalSelectors.concat(selectors);
293
289 return selectors; 294 return selectors;
290 } 295 }
291 }; 296 };
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld