Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reuse existing Set/Map when calling scriptletFilteringEngine.retrieve 

Reuse permanent instances instead. The trailing `$` is
used to denote these variables are register-like
instances, i.e. their content is valid only for the
duration of the call. (From now on I will use this
convention throughout the code base.)
This commit is contained in:
Raymond Hill 2019-09-10 13:59:28 -04:00
parent a73dd0a9f2
commit 1e7e6f86a6
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/js/scriptlet-filtering.js
View File

@ -342,6 +342,10 @@
}
};
const scriptlets$ = new Set();
const exceptions$ = new Set();
const scriptletToCodeMap$ = new Map();
api.retrieve = function(request) {
if ( scriptletDB.size === 0 ) { return; }
if ( µb.hiddenSettings.ignoreScriptInjectFilters ) { return; }
@ -360,41 +364,41 @@
return;
}
const scriptlets = new Set();
const exceptions = new Set();
scriptlets$.clear();
exceptions$.clear();
scriptletDB.retrieve(
hostname,
[ scriptlets, exceptions ]
[ scriptlets$, exceptions$ ]
);
if ( request.entity !== '' ) {
scriptletDB.retrieve(
`${hostname.slice(0, -request.domain.length)}${request.entity}`,
[ scriptlets, exceptions ]
[ scriptlets$, exceptions$ ]
);
}
if ( scriptlets.size === 0 ) { return; }
if ( scriptlets$.size === 0 ) { return; }
const loggerEnabled = µb.logger.enabled;
// Wholly disable scriptlet injection?
if ( exceptions.has('') ) {
if ( exceptions$.has('') ) {
if ( loggerEnabled ) {
logOne(true, '', request);
}
return;
}
const scriptletToCodeMap = new Map();
for ( const rawToken of scriptlets ) {
lookupScriptlet(rawToken, reng, scriptletToCodeMap);
scriptletToCodeMap$.clear();
for ( const rawToken of scriptlets$ ) {
lookupScriptlet(rawToken, reng, scriptletToCodeMap$);
}
if ( scriptletToCodeMap.size === 0 ) { return; }
if ( scriptletToCodeMap$.size === 0 ) { return; }
// Return an array of scriptlets, and log results if needed.
const out = [];
for ( const [ rawToken, code ] of scriptletToCodeMap ) {
const isException = exceptions.has(rawToken);
for ( const [ rawToken, code ] of scriptletToCodeMap$ ) {
const isException = exceptions$.has(rawToken);
if ( isException === false ) {
out.push(code);
}