prehistoric-systems/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2026-03-11 09:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix specifichide option

Browse source 
Related internal feedback:
https://github.com/uBlockOrigin/uBlock-discussions/discussions/964
This commit is contained in:
Raymond Hill 2025-12-26 09:22:42 -05:00
parent 9cf8a0fe7c
commit 024019094f
No known key found for this signature in database
GPG key ID: F5630CAE62A14316
1 changed files with 35 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/js/cosmetic-filtering.js
View file

@ -758,11 +758,9 @@ CosmeticFilteringEngine.prototype.retrieveSpecificSelectors = function(
disableSurveyor: this.lowlyGeneric.size === 0,
};
const injectedCSS = [];
const exceptionSet = new Set();
if (
options.noSpecificCosmeticFiltering !== true ||
options.noGenericCosmeticFiltering !== true
) {
if ( options.noSpecificCosmeticFiltering !== true ) {
// Cached cosmetic filters: these are always declarative.
const specificSet = new Set();
if ( cacheEntry !== undefined ) {
@ -785,7 +783,6 @@ CosmeticFilteringEngine.prototype.retrieveSpecificSelectors = function(
// Split filters in different groups
const proceduralSet = new Set();
const exceptionSet = new Set();
for ( const s of allSet ) {
const selector = s.slice(1);
if ( s.charCodeAt(0) === 0x2D /* - */ ) {
@ -837,44 +834,44 @@ CosmeticFilteringEngine.prototype.retrieveSpecificSelectors = function(
}
out.proceduralFilters.push(...proceduralSet);
}
}
// Highly generic cosmetic filters: sent once along with specific ones.
// A most-recent-used cache is used to skip computing the resulting set
// of high generics for a given set of exceptions.
// The resulting set of high generics is stored as a string, ready to
// be used as-is by the content script. The string is stored
// indirectly in the mru cache: this is to prevent duplication of the
// string in memory, which I have observed occurs when the string is
// stored directly as a value in a Map.
if ( options.noGenericCosmeticFiltering !== true ) {
const exceptionSetHash = out.exceptionFilters.join();
for ( const key in this.highlyGeneric ) {
const entry = this.highlyGeneric[key];
let str = entry.mru.lookup(exceptionSetHash);
if ( str === undefined ) {
str = { s: entry.str, excepted: [] };
let genericSet = entry.dict;
let hit = false;
// Highly generic cosmetic filters: sent once along with specific ones.
// A most-recent-used cache is used to skip computing the resulting set
// of high generics for a given set of exceptions.
// The resulting set of high generics is stored as a string, ready to
// be used as-is by the content script. The string is stored
// indirectly in the mru cache: this is to prevent duplication of the
// string in memory, which I have observed occurs when the string is
// stored directly as a value in a Map.
if ( options.noGenericCosmeticFiltering !== true ) {
const exceptionSetHash = out.exceptionFilters.join();
for ( const key in this.highlyGeneric ) {
const entry = this.highlyGeneric[key];
let str = entry.mru.lookup(exceptionSetHash);
if ( str === undefined ) {
str = { s: entry.str, excepted: [] };
let genericSet = entry.dict;
let hit = false;
for ( const exception of exceptionSet ) {
if ( (hit = genericSet.has(exception)) ) { break; }
}
if ( hit ) {
genericSet = new Set(entry.dict);
for ( const exception of exceptionSet ) {
if ( (hit = genericSet.has(exception)) ) { break; }
}
if ( hit ) {
genericSet = new Set(entry.dict);
for ( const exception of exceptionSet ) {
if ( genericSet.delete(exception) ) {
str.excepted.push(exception);
}
if ( genericSet.delete(exception) ) {
str.excepted.push(exception);
}
str.s = Array.from(genericSet).join(',\n');
}
entry.mru.add(exceptionSetHash, str);
}
if ( str.excepted.length !== 0 ) {
out.exceptedFilters.push(...str.excepted);
}
if ( str.s.length !== 0 ) {
injectedCSS.push(`${str.s}\n{display:none!important;}`);
str.s = Array.from(genericSet).join(',\n');
}
entry.mru.add(exceptionSetHash, str);
}
if ( str.excepted.length !== 0 ) {
out.exceptedFilters.push(...str.excepted);
}
if ( str.s.length !== 0 ) {
injectedCSS.push(`${str.s}\n{display:none!important;}`);
}
}
}