-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fine tune cosmetic filtering badge-related code
Related issue: - uBlockOrigin/uBlock-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.
- Loading branch information
Showing
4 changed files
with
97 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
})(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters