mirror of
https://github.com/gorhill/uBlock.git
synced 2024-11-07 03:12:33 +01:00
Fine tune cosmetic filtering badge-related code
Related issue: - https://github.com/uBlockOrigin/uBlock-issues/issues/756 As per various feedbacks: Added an advanced setting to keep the original behavior, which can be potentially costly CPU-wise on some sites: popupCosmeticFilterBadgeSlow Default to `false`. Set to `true` to restore original method of surveying the number of elements hidden as a result of applying cosmetic filtering. As suggested by <https://github.com/gwarser>, skip descendant of nodes which have been found to be a match in order to potentially increase the number of nodes which can be surveyed in the alloted time.
This commit is contained in:
parent
c84c0979ce
commit
571db71318
@ -56,6 +56,7 @@ const µBlock = (( ) => { // jshint ignore:line
|
|||||||
filterAuthorMode: false,
|
filterAuthorMode: false,
|
||||||
loggerPopupType: 'popup',
|
loggerPopupType: 'popup',
|
||||||
manualUpdateAssetFetchPeriod: 500,
|
manualUpdateAssetFetchPeriod: 500,
|
||||||
|
popupCosmeticFilterBadgeSlow: false,
|
||||||
popupFontSize: 'unset',
|
popupFontSize: 'unset',
|
||||||
requestJournalProcessPeriod: 1000,
|
requestJournalProcessPeriod: 1000,
|
||||||
selfieAfter: 3,
|
selfieAfter: 3,
|
||||||
|
@ -387,7 +387,10 @@ const onMessage = function(request, sender, callback) {
|
|||||||
// Async
|
// Async
|
||||||
switch ( request.what ) {
|
switch ( request.what ) {
|
||||||
case 'getHiddenElementCount':
|
case 'getHiddenElementCount':
|
||||||
getElementCount(request.tabId, 'elements').then(count => {
|
const scriptlet = µb.hiddenSettings.popupCosmeticFilterBadgeSlow
|
||||||
|
? 'elements-all'
|
||||||
|
: 'elements';
|
||||||
|
getElementCount(request.tabId, scriptlet).then(count => {
|
||||||
callback(count);
|
callback(count);
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
|
72
src/js/scriptlets/dom-survey-elements-all.js
Normal file
72
src/js/scriptlets/dom-survey-elements-all.js
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
/*******************************************************************************
|
||||||
|
|
||||||
|
uBlock Origin - a browser extension to block requests.
|
||||||
|
Copyright (C) 2015-present Raymond Hill
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program 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 this program. If not, see {http://www.gnu.org/licenses/}.
|
||||||
|
|
||||||
|
Home: https://github.com/gorhill/uBlock
|
||||||
|
*/
|
||||||
|
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
/******************************************************************************/
|
||||||
|
|
||||||
|
// https://github.com/uBlockOrigin/uBlock-issues/issues/756
|
||||||
|
// Keep in mind CPU usage with large DOM and/or filterset.
|
||||||
|
|
||||||
|
(( ) => {
|
||||||
|
if ( typeof vAPI !== 'object' ) { return; }
|
||||||
|
|
||||||
|
const t0 = Date.now();
|
||||||
|
|
||||||
|
if ( vAPI.domSurveyElements instanceof Object === false ) {
|
||||||
|
vAPI.domSurveyElements = {
|
||||||
|
busy: false,
|
||||||
|
hiddenElementCount: Number.NaN,
|
||||||
|
surveyTime: t0,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
const surveyResults = vAPI.domSurveyElements;
|
||||||
|
|
||||||
|
if ( surveyResults.busy ) { return; }
|
||||||
|
surveyResults.busy = true;
|
||||||
|
|
||||||
|
if ( surveyResults.surveyTime < vAPI.domMutationTime ) {
|
||||||
|
surveyResults.hiddenElementCount = Number.NaN;
|
||||||
|
}
|
||||||
|
surveyResults.surveyTime = t0;
|
||||||
|
|
||||||
|
if ( isNaN(surveyResults.hiddenElementCount) ) {
|
||||||
|
surveyResults.hiddenElementCount = (( ) => {
|
||||||
|
if ( vAPI.domFilterer instanceof Object === false ) { return 0; }
|
||||||
|
const details = vAPI.domFilterer.getAllSelectors_(true);
|
||||||
|
if (
|
||||||
|
Array.isArray(details.declarative) === false ||
|
||||||
|
details.declarative.length === 0
|
||||||
|
) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
return document.querySelectorAll(
|
||||||
|
details.declarative.map(entry => entry[0]).join(',')
|
||||||
|
).length;
|
||||||
|
})();
|
||||||
|
}
|
||||||
|
|
||||||
|
surveyResults.busy = false;
|
||||||
|
|
||||||
|
// IMPORTANT: This is returned to the injector, so this MUST be
|
||||||
|
// the last statement.
|
||||||
|
return surveyResults.hiddenElementCount;
|
||||||
|
})();
|
@ -72,34 +72,32 @@
|
|||||||
}
|
}
|
||||||
const simpleStr = simple.join(',\n');
|
const simpleStr = simple.join(',\n');
|
||||||
const complexStr = complex.join(',\n');
|
const complexStr = complex.join(',\n');
|
||||||
const nodeIter = document.createNodeIterator(
|
const nodeIter = document.createTreeWalker(
|
||||||
document.body,
|
document.body,
|
||||||
NodeFilter.SHOW_ELEMENT
|
NodeFilter.SHOW_ELEMENT
|
||||||
);
|
);
|
||||||
const candidates = new Set();
|
|
||||||
for (;;) {
|
|
||||||
const node = nodeIter.nextNode();
|
|
||||||
if ( node === null ) { break; }
|
|
||||||
if ( node.offsetParent === null ) {
|
|
||||||
candidates.add(node);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
const matched = new Set();
|
const matched = new Set();
|
||||||
if ( simpleStr !== '') {
|
let node = nodeIter.nextNode();
|
||||||
for ( const node of candidates ) {
|
for (;;) {
|
||||||
if ( Date.now() > tMax ) { return -1; }
|
if ( node === null ) { break; }
|
||||||
if ( node.matches(simpleStr) === false ) { continue; }
|
if ( Date.now() > tMax ) { return -1; }
|
||||||
candidates.delete(node);
|
if (
|
||||||
matched.add(node);
|
(node.offsetParent !== null) ||
|
||||||
if ( matched.size === 99 ) { break; }
|
(simpleStr === '' || node.matches(simpleStr) === false) &&
|
||||||
|
(complexStr === '' || node.closest(complexStr) !== node)
|
||||||
|
) {
|
||||||
|
node = nodeIter.nextNode();
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
}
|
matched.add(node);
|
||||||
if ( matched.size < 99 && complexStr !== '') {
|
if ( matched.size === 99 ) { break; }
|
||||||
for ( const node of candidates ) {
|
// https://github.com/uBlockOrigin/uBlock-issues/issues/756#issuecomment-549079064
|
||||||
if ( Date.now() > tMax ) { return -1; }
|
// Skip descendants when a match is detected.
|
||||||
if ( node.closest(complexStr) !== node ) { continue; }
|
for (;;) {
|
||||||
matched.add(node);
|
node = nodeIter.nextSibling();
|
||||||
if ( matched.size === 99 ) { break; }
|
if ( node !== null ) { break; }
|
||||||
|
node = nodeIter.parentNode();
|
||||||
|
if ( node === null ) { break; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return matched.size;
|
return matched.size;
|
||||||
|
Loading…
Reference in New Issue
Block a user