CodeMirror/uMatrix
1
0
Fork 0
mirror of https://github.com/gorhill/uMatrix.git synced 2024-06-02 18:34:52 +12:00
Code Issues Releases Wiki Activity

fix https://github.com/uBlockOrigin/uMatrix-issues/issues/28

Browse source
This commit is contained in:
Raymond Hill 2018-07-05 14:38:05 -04:00
parent 2714193b73
commit 18490b9bf8
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
1 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/js/pagestats.js
View file

@ -40,11 +40,11 @@ var BlockedCollapsibles = function() {
BlockedCollapsibles.prototype = { BlockedCollapsibles.prototype = {
shelfLife: 10 * 1000, shelfLife: 10,
add: function(type, url, isSpecific) { add: function(type, url, isSpecific) {
if ( this.blocked.size === 0 ) { this.pruneAsync(); } if ( this.blocked.size === 0 ) { this.pruneAsync(); }
var now = Date.now() / 1000 | 0; let now = Date.now() / 1000 | 0;
// The following "trick" is to encode the specifity into the lsb of the // The following "trick" is to encode the specifity into the lsb of the
// time stamp so as to avoid to have to allocate a memory structure to // time stamp so as to avoid to have to allocate a memory structure to
// store both time stamp and specificity. // store both time stamp and specificity.
@ -54,7 +54,7 @@ BlockedCollapsibles.prototype = {
now &= 0xFFFFFFFE; now &= 0xFFFFFFFE;
} }
this.blocked.set(type + ' ' + url, now); this.blocked.set(type + ' ' + url, now);
this.hash = now; this.hash += 1;
}, },
reset: function() { reset: function() {
@ -70,15 +70,15 @@ BlockedCollapsibles.prototype = {
if ( this.timer === null ) { if ( this.timer === null ) {
this.timer = vAPI.setTimeout( this.timer = vAPI.setTimeout(
this.boundPruneAsyncCallback, this.boundPruneAsyncCallback,
this.shelfLife * 2 this.shelfLife * 2000
); );
} }
}, },
pruneAsyncCallback: function() { pruneAsyncCallback: function() {
this.timer = null; this.timer = null;
var obsolete = Date.now() - this.shelfLife; let obsolete = Math.ceil(Date.now() / 1000) - this.shelfLife;
for ( var entry of this.blocked ) { for ( let entry of this.blocked ) {
if ( entry[1] <= obsolete ) { if ( entry[1] <= obsolete ) {
this.blocked.delete(entry[0]); this.blocked.delete(entry[0]);
} }
@ -168,36 +168,32 @@ PageStore.prototype = {
var tabContext = µm.tabContextManager.lookup(this.tabId); var tabContext = µm.tabContextManager.lookup(this.tabId);
if ( tabContext === null ) { return; } if ( tabContext === null ) { return; }
var collapseBlacklisted = µm.userSettings.collapseBlacklisted,
collapseBlocked = µm.userSettings.collapseBlocked,
entry;
var blockedResources = response.blockedResources;
if ( if (
Array.isArray(request.toFilter) && Array.isArray(request.toFilter) &&
request.toFilter.length !== 0 request.toFilter.length !== 0
) { ) {
var roothn = tabContext.rootHostname, let roothn = tabContext.rootHostname,
hnFromURI = µm.URI.hostnameFromURI, hnFromURI = µm.URI.hostnameFromURI,
tMatrix = µm.tMatrix; tMatrix = µm.tMatrix;
for ( entry of request.toFilter ) { for ( let entry of request.toFilter ) {
if ( tMatrix.mustBlock(roothn, hnFromURI(entry.url), entry.type) === false ) { if ( tMatrix.mustBlock(roothn, hnFromURI(entry.url), entry.type) ) {
continue; this.blockedCollapsibles.add(
entry.type,
entry.url,
tMatrix.specificityRegister < 5
);
} }
blockedResources.push([
entry.type + ' ' + entry.url,
collapseBlocked ||
collapseBlacklisted && tMatrix.specificityRegister !== 0 &&
tMatrix.specificityRegister < 5
]);
} }
} }
if ( this.blockedCollapsibles.hash === response.hash ) { return; } if ( this.blockedCollapsibles.hash === response.hash ) { return; }
response.hash = this.blockedCollapsibles.hash; response.hash = this.blockedCollapsibles.hash;
for ( entry of this.blockedCollapsibles.blocked ) { let collapseBlacklisted = µm.userSettings.collapseBlacklisted,
collapseBlocked = µm.userSettings.collapseBlocked,
blockedResources = response.blockedResources;
for ( let entry of this.blockedCollapsibles.blocked ) {
blockedResources.push([ blockedResources.push([
entry[0], entry[0],
collapseBlocked || collapseBlacklisted && (entry[1] & 1) !== 0 collapseBlocked || collapseBlacklisted && (entry[1] & 1) !== 0