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

code review

This commit is contained in:
gorhill 2015-06-13 13:32:14 -04:00
parent 86acda1a90
commit 34723e1a45
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/js/reverselookup-worker.js
View File

@ -80,7 +80,7 @@ var fromNetFilter = function(details) {
// Mainly, given a CSS selector and a hostname as context, we will derive // Mainly, given a CSS selector and a hostname as context, we will derive
// various versions of compiled filters and see if there are matches. This way // various versions of compiled filters and see if there are matches. This way
// the whole CPU cost is incurred by the reverse lookup code -- in a worker // the whole CPU cost is incurred by the reverse lookup code -- in a worker
// thread, and the cosmetic filtering engine incurred zero cost. // thread, and the cosmetic filtering engine incurs no cost at all.
// //
// For this though, the reverse lookup code here needs some knowledge of // For this though, the reverse lookup code here needs some knowledge of
// the inners of the cosmetic filtering engine. // the inners of the cosmetic filtering engine.
@ -103,12 +103,13 @@ var fromCosmeticFilter = function(details) {
var matches = rePlainSelector.exec(filter); var matches = rePlainSelector.exec(filter);
if ( matches ) { if ( matches ) {
if ( matches[0] === filter ) { // simple CSS selector if ( matches[0] === filter ) { // simple CSS selector
reStr = rescape('c\vlg\v') + '\\w+' + rescape('\v' + filter); reStr = rescape('c\vlg\v');
} else { // complex CSS selector } else { // complex CSS selector
reStr = rescape('c\vlg+\v') + '\\w+' + rescape('\v' + filter); reStr = rescape('c\vlg+\v');
} }
reStr += '\\w+' + rescape('\v' + filter);
} else if ( reHighLow.test(filter) ) { // [alt] or [title] } else if ( reHighLow.test(filter) ) { // [alt] or [title]
reStr = rescape('c\vhlg0\v' + filter) + '(?:\\n|$)'; reStr = rescape('c\vhlg0\v' + filter);
} else if ( reHighMedium.test(filter) ) { // [href^="..."] } else if ( reHighMedium.test(filter) ) { // [href^="..."]
reStr = rescape('c\vhmg0\v') + '\\w+' + rescape('\v' + filter); reStr = rescape('c\vhmg0\v') + '\\w+' + rescape('\v' + filter);
} else { // all else } else { // all else
@ -116,6 +117,8 @@ var fromCosmeticFilter = function(details) {
} }
candidates[details.rawFilter] = new RegExp(reStr + '(?:\\n|$)'); candidates[details.rawFilter] = new RegExp(reStr + '(?:\\n|$)');
// Second step: find hostname-based versions.
// Reference: FilterContainer.compileHostnameSelector().
var pos; var pos;
var domain = details.domain; var domain = details.domain;
var hostname = details.hostname; var hostname = details.hostname;
@ -144,7 +147,8 @@ var fromCosmeticFilter = function(details) {
} }
} }
// Entity-based // Last step: find entity-based versions.
// Reference: FilterContainer.compileEntitySelector().
pos = domain.indexOf('.'); pos = domain.indexOf('.');
if ( pos !== -1 ) { if ( pos !== -1 ) {
var entity = domain.slice(0, pos); var entity = domain.slice(0, pos);