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

Side by Side Diff: lib/filterClasses.js

Issue 30000567: Noissue - Match location before checking if filter applies to domain (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Created Feb. 6, 2019, 8:10 a.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 854 matching lines...) Expand 10 before | Expand all | Expand 10 after
865 * @param {string} [docDomain] domain name of the document that loads the URL 865 * @param {string} [docDomain] domain name of the document that loads the URL
866 * @param {boolean} [thirdParty] should be true if the URL is a third-party 866 * @param {boolean} [thirdParty] should be true if the URL is a third-party
867 * request 867 * request
868 * @param {string} [sitekey] public key provided by the document 868 * @param {string} [sitekey] public key provided by the document
869 * @return {boolean} true in case of a match 869 * @return {boolean} true in case of a match
870 */ 870 */
871 matches(location, typeMask, docDomain, thirdParty, sitekey) 871 matches(location, typeMask, docDomain, thirdParty, sitekey)
872 { 872 {
873 return (this.contentType & typeMask) != 0 && 873 return (this.contentType & typeMask) != 0 &&
874 (this.thirdParty == null || this.thirdParty == thirdParty) && 874 (this.thirdParty == null || this.thirdParty == thirdParty) &&
875 this.isActiveOnDomain(docDomain, sitekey) && 875 this.matchesLocation(location) &&
876 this.matchesLocation(location); 876 this.isActiveOnDomain(docDomain, sitekey);
877 }, 877 },
878 878
879 /** 879 /**
880 * Checks whether the given URL matches this filter's pattern. 880 * Checks whether the given URL matches this filter's pattern.
881 * @param {string} location The URL to check. 881 * @param {string} location The URL to check.
882 * @param {?string} [lowerCaseLocation] The lower-case version of the URL to 882 * @param {?string} [lowerCaseLocation] The lower-case version of the URL to
883 * check, for case-insensitive matching. 883 * check, for case-insensitive matching.
884 * @returns {boolean} <code>true</code> if the URL matches. 884 * @returns {boolean} <code>true</code> if the URL matches.
885 * @package 885 * @package
886 */ 886 */
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
1436 1436
1437 /** 1437 /**
1438 * Script that should be executed 1438 * Script that should be executed
1439 * @type {string} 1439 * @type {string}
1440 */ 1440 */
1441 get script() 1441 get script()
1442 { 1442 {
1443 return this.body; 1443 return this.body;
1444 } 1444 }
1445 }); 1445 });
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