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

Side by Side Diff: lib/elemHideEmulation.js

Issue 29743730: Issue 6559 - Use maps and sets where appropriate (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Revert logic in getUnconditionalFilterKeys Created April 6, 2018, 1:32 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 | « lib/elemHide.js ('k') | 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
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 "use strict"; 18 "use strict";
19 19
20 /** 20 /**
21 * @fileOverview Element hiding emulation implementation. 21 * @fileOverview Element hiding emulation implementation.
22 */ 22 */
23 23
24 const {ElemHide} = require("./elemHide"); 24 const {ElemHide} = require("./elemHide");
25 const {Filter} = require("./filterClasses"); 25 const {Filter} = require("./filterClasses");
26 26
27 let filters = Object.create(null); 27 let filters = new Set();
28 28
29 /** 29 /**
30 * Container for element hiding emulation filters 30 * Container for element hiding emulation filters
31 * @class 31 * @class
32 */ 32 */
33 let ElemHideEmulation = { 33 let ElemHideEmulation = {
34 /** 34 /**
35 * Removes all known filters 35 * Removes all known filters
36 */ 36 */
37 clear() 37 clear()
38 { 38 {
39 filters = Object.create(null); 39 filters.clear();
40 }, 40 },
41 41
42 /** 42 /**
43 * Add a new element hiding emulation filter 43 * Add a new element hiding emulation filter
44 * @param {ElemHideEmulationFilter} filter 44 * @param {ElemHideEmulationFilter} filter
45 */ 45 */
46 add(filter) 46 add(filter)
47 { 47 {
48 filters[filter.text] = true; 48 filters.add(filter.text);
49 }, 49 },
50 50
51 /** 51 /**
52 * Removes an element hiding emulation filter 52 * Removes an element hiding emulation filter
53 * @param {ElemHideEmulationFilter} filter 53 * @param {ElemHideEmulationFilter} filter
54 */ 54 */
55 remove(filter) 55 remove(filter)
56 { 56 {
57 delete filters[filter.text]; 57 filters.delete(filter.text);
58 }, 58 },
59 59
60 /** 60 /**
61 * Returns a list of all rules active on a particular domain 61 * Returns a list of all rules active on a particular domain
62 * @param {string} domain 62 * @param {string} domain
63 * @return {ElemHideEmulationFilter[]} 63 * @return {ElemHideEmulationFilter[]}
64 */ 64 */
65 getRulesForDomain(domain) 65 getRulesForDomain(domain)
66 { 66 {
67 let result = []; 67 let result = [];
68 let keys = Object.getOwnPropertyNames(filters); 68 for (let text of filters.values())
69 for (let key of keys)
70 { 69 {
71 let filter = Filter.fromText(key); 70 let filter = Filter.fromText(text);
72 if (filter.isActiveOnDomain(domain) && 71 if (filter.isActiveOnDomain(domain) &&
73 !ElemHide.getException(filter, domain)) 72 !ElemHide.getException(filter, domain))
74 { 73 {
75 result.push(filter); 74 result.push(filter);
76 } 75 }
77 } 76 }
78 return result; 77 return result;
79 } 78 }
80 }; 79 };
81 exports.ElemHideEmulation = ElemHideEmulation; 80 exports.ElemHideEmulation = ElemHideEmulation;
OLDNEW
« no previous file with comments | « lib/elemHide.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld