Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-09-15 15:32:28 +02:00
Code Issues Releases Wiki Activity

fix #3201

Browse Source
This commit is contained in:
gorhill 2017-11-07 11:31:19 -05:00
parent 8b2c6a6280
commit 9d86ab0af9
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/js/pagestore.js
View File

@ -240,8 +240,8 @@ var pageStoreJunkyardMax = 10;
/******************************************************************************/
var PageStore = function(tabId) {
this.init(tabId);
var PageStore = function(tabId, context) {
this.init(tabId, context);
this.journal = [];
this.journalTimer = null;
this.journalLastCommitted = this.journalLastUncommitted = undefined;
@ -250,19 +250,23 @@ var PageStore = function(tabId) {
/******************************************************************************/
PageStore.factory = function(tabId) {
PageStore.factory = function(tabId, context) {
var entry = pageStoreJunkyard.pop();
if ( entry === undefined ) {
entry = new PageStore(tabId);
entry = new PageStore(tabId, context);
} else {
entry.init(tabId);
entry.init(tabId, context);
}
return entry;
};
/******************************************************************************/
PageStore.prototype.init = function(tabId) {
// https://github.com/gorhill/uBlock/issues/3201
// The context is used to determine whether we report behavior change to the
// logger.
PageStore.prototype.init = function(tabId, context) {
var tabContext = µb.tabContextManager.mustLookup(tabId);
this.tabId = tabId;
@ -292,8 +296,15 @@ PageStore.prototype.init = function(tabId) {
this.netFilteringCache = NetFilteringResultCache.factory();
this.internalRedirectionCount = 0;
this.noCosmeticFiltering = µb.hnSwitches.evaluateZ('no-cosmetic-filtering', tabContext.rootHostname) === true;
if ( this.noCosmeticFiltering && µb.logger.isEnabled() ) {
this.noCosmeticFiltering = µb.hnSwitches.evaluateZ(
'no-cosmetic-filtering',
tabContext.rootHostname
) === true;
if (
this.noCosmeticFiltering &&
µb.logger.isEnabled() &&
context === 'tabCommitted'
) {
µb.logger.writeOne(
tabId,
'cosmetic',
@ -314,7 +325,11 @@ PageStore.prototype.init = function(tabId) {
'generichide'
);
this.noGenericCosmeticFiltering = result === 2;
if ( result !== 0 && µb.logger.isEnabled() ) {
if (
result !== 0 &&
µb.logger.isEnabled() &&
context === 'tabCommitted'
) {
µb.logger.writeOne(
tabId,
'net',
@ -360,7 +375,7 @@ PageStore.prototype.reuse = function(context) {
}
this.disposeFrameStores();
this.netFilteringCache = this.netFilteringCache.dispose();
this.init(this.tabId);
this.init(this.tabId, context);
return this;
};

2
src/js/tab.js
View File

@ -843,7 +843,7 @@ vAPI.tabs.registerListeners();
if ( !pageStore ) {
this.updateTitle(tabId);
this.pageStoresToken = Date.now();
return (this.pageStores[tabId] = this.PageStore.factory(tabId));
return (this.pageStores[tabId] = this.PageStore.factory(tabId, context));
}
// https://github.com/chrisaljoudi/uBlock/issues/516