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

speed boost for processing high-high generics

This commit is contained in:
gorhill 2015-03-01 19:25:36 -05:00
parent c28568f9b0
commit fc981aef29
1 changed files with 56 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/js/contentscript-end.js
View File

@ -93,25 +93,22 @@ var messager = vAPI.messaging.channel('contentscript-end.js');
return;
}
//var tStart = window.performance.now();
var queriedSelectors = {};
var injectedSelectors = {};
var classSelectors = null;
var idSelectors = null;
var lowGenericSelectors = [];
var highGenerics = null;
var contextNodes = [document];
var nullArray = { push: function(){} };
var retrieveGenericSelectors = function() {
var selectors = classSelectors !== null ? Object.keys(classSelectors) : [];
if ( idSelectors !== null ) {
selectors = selectors.concat(idSelectors);
}
if ( selectors.length > 0 || highGenerics === null ) {
//console.log('µBlock> ABP cosmetic filters: retrieving CSS rules using %d selectors', selectors.length);
if ( lowGenericSelectors.length > 0 || highGenerics === null ) {
//console.log('µBlock> ABP cosmetic filters: retrieving CSS rules using %d selectors', lowGenericSelectors.length);
messager.send({
what: 'retrieveGenericCosmeticSelectors',
pageURL: window.location.href,
selectors: selectors,
selectors: lowGenericSelectors,
highGenerics: highGenerics === null
},
retrieveHandler
@ -122,8 +119,7 @@ var messager = vAPI.messaging.channel('contentscript-end.js');
} else {
otherRetrieveHandler(null);
}
idSelectors = null;
classSelectors = null;
lowGenericSelectors = [];
};
// https://github.com/gorhill/uBlock/issues/452
@ -139,7 +135,7 @@ var messager = vAPI.messaging.channel('contentscript-end.js');
var selectors = vAPI.hideCosmeticFilters;
if ( typeof selectors === 'object' ) {
injectedSelectors = selectors;
hideElements(Object.keys(selectors).join(','));
//hideElements(Object.keys(selectors));
}
// Add exception filters into injected filters collection, in order
// to force them to be seen as "already injected".
@ -158,6 +154,7 @@ var messager = vAPI.messaging.channel('contentscript-end.js');
};
var otherRetrieveHandler = function(selectors) {
//var tStart = window.performance.now();
//console.debug('µBlock> contextNodes = %o', contextNodes);
if ( selectors && selectors.highGenerics ) {
highGenerics = selectors.highGenerics;
@ -196,6 +193,7 @@ var messager = vAPI.messaging.channel('contentscript-end.js');
addStyleTag(hideSelectors);
}
contextNodes.length = 0;
//console.debug('%f: uBlock: CSS injection time', window.performance.now() - tStart);
};
var retrieveHandler = firstRetrieveHandler;
@ -206,10 +204,10 @@ var messager = vAPI.messaging.channel('contentscript-end.js');
// - Injecting a style tag
var addStyleTag = function(selectors) {
hideElements(selectors);
//hideElements(selectors);
var style = document.createElement('style');
// The linefeed before the style block is very important: do no remove!
style.appendChild(document.createTextNode(selectors.join(',\n') + '\n{display:none !important;}'));
style.appendChild(document.createTextNode(selectors.toString() + '\n{display:none !important;}'));
var parent = document.body || document.documentElement;
if ( parent ) {
parent.appendChild(style);
@ -349,12 +347,46 @@ var messager = vAPI.messaging.channel('contentscript-end.js');
// requests to process high-high generics into as few requests as possible.
// The gain is *significant* on bloated pages.
// Speed boost (uBlock 0.8.9.2+):
// Element.matches is MUCH faster than document.querySelector().
//
// Example:
// gmail.com, a page rich in mutation events, which causes many calls
// to processHighHighGenerics(). Cumulative time of 24 calls to
// matchesSelector() (default filter lists):
// Chromium 40:
// - document.querySelector() = 44.79 ms
// - document.body.matches() = 6.06 ms
// Firefox 36:
// - document.querySelector() = 14.23 ms
// - document.body.matches() = 2.97 ms
//
// However, Element.matches() is available from Chromium 34/Firefox 34. So
// we fall back to slower document.querySelector() when Element.matches()
// is not available.
var matchesSelector = (function() {
if ( document.body && document.body.matches ) {
return function(selector) {
return document.body.matches(selector);
};
}
return function(selector) {
return document.querySelector(selector) !== null;
};
})();
var processHighHighGenericsTimer = null;
var processHighHighGenerics = function() {
processHighHighGenericsTimer = null;
if ( injectedSelectors.hasOwnProperty('{{highHighGenerics}}') ) { return; }
if ( document.querySelector(highGenerics.hideHigh) === null ) { return; }
if ( injectedSelectors.hasOwnProperty('{{highHighGenerics}}') ) {
return;
}
//var tStart = window.performance.now();
if ( matchesSelector(highGenerics.hideHigh) === false ) {
//console.debug('%f: uBlock: high-high generic time', window.performance.now() - tStart);
return;
}
injectedSelectors['{{highHighGenerics}}'] = true;
// We need to filter out possible exception cosmetic filters from
// high-high generics selectors.
@ -388,11 +420,8 @@ var messager = vAPI.messaging.channel('contentscript-end.js');
if ( !nodes || !nodes.length ) {
return;
}
if ( idSelectors === null ) {
idSelectors = [];
}
var qq = queriedSelectors;
var ii = idSelectors;
var ll = lowGenericSelectors;
var node, v;
var i = nodes.length;
while ( i-- ) {
@ -404,8 +433,8 @@ var messager = vAPI.messaging.channel('contentscript-end.js');
v = v.trim();
if ( v === '' ) { continue; }
v = '#' + v;
if ( qq[v] ) { continue; }
ii.push(v);
if ( qq.hasOwnProperty(v) ) { continue; }
ll.push(v);
qq[v] = true;
}
};
@ -417,11 +446,8 @@ var messager = vAPI.messaging.channel('contentscript-end.js');
if ( !nodes || !nodes.length ) {
return;
}
if ( classSelectors === null ) {
classSelectors = {};
}
var qq = queriedSelectors;
var cc = classSelectors;
var ll = lowGenericSelectors;
var node, v, vv, j;
var i = nodes.length;
while ( i-- ) {
@ -433,8 +459,8 @@ var messager = vAPI.messaging.channel('contentscript-end.js');
v = vv[j];
if ( typeof v !== 'string' ) { continue; }
v = '.' + v;
if ( qq[v] ) { continue; }
cc[v] = true;
if ( qq.hasOwnProperty(v) ) { continue; }
ll.push(v);
qq[v] = true;
}
}
@ -446,6 +472,8 @@ var messager = vAPI.messaging.channel('contentscript-end.js');
classesFromNodeList(document.querySelectorAll('[class]'));
retrieveGenericSelectors();
//console.debug('%f: uBlock: survey time', window.performance.now() - tStart);
// Below this point is the code which takes care to observe changes in
// the page and to add if needed relevant CSS rules as a result of the
// changes.
@ -528,7 +556,6 @@ var messager = vAPI.messaging.channel('contentscript-end.js');
(function() {
// https://github.com/gorhill/uBlock/issues/683
// Instead of a closure we use a map to remember the element to collapse
// or hide.
var filterRequestId = 1;
var filterRequests = {};