external/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-10 01:02:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

code review re 029bc946ad

Browse source 
- fix error message when disabling extension
- properly cleanup when disabling extension
This commit is contained in:
gorhill 2016-09-25 16:02:11 -04:00
parent c538b260de
commit 69a76109c8
1 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
platform/firefox/frameModule.js
View file

@ -88,18 +88,6 @@ var scriptTagFilterer = (function() {
if ( cpmm ) { return cpmm.getService(Ci.nsISyncMessageSender); }
};
var listener = function(message) {
var details;
try {
details = JSON.parse(message.data);
} catch (ex) {
}
if ( !details || !details.msg ) { return; }
if (details.msg.what === 'staticFilteringDataChanged' ) {
reset();
}
};
var getScriptTagHostnames = function() {
if ( scriptTagHostnames ) {
return scriptTagHostnames;
@ -154,7 +142,6 @@ var scriptTagFilterer = (function() {
return {
get: regexFromHostname,
listener: listener,
reset: reset
};
})();
@ -417,6 +404,7 @@ var contentObserver = {
sandbox.topContentScript = win === win.top;
// https://developer.mozilla.org/en-US/Firefox/Multiprocess_Firefox/Message_Manager/Frame_script_loading_and_lifetime#Unloading_frame_scripts
// The goal is to have content scripts removed from web pages. This
// helps remove traces of uBlock from memory when disabling/removing
// the addon.
@ -434,7 +422,11 @@ var contentObserver = {
sandbox.removeMessageListener =
sandbox.sendAsyncMessage = function(){};
sandbox.vAPI = {};
messager = sandbox = null;
if ( messager && messager.ublock0LocationChangeListener ) {
messager.ublock0LocationChangeListener.stop();
delete messager.ublock0LocationChangeListener;
}
messager = null;
};
}
else {
@ -456,7 +448,14 @@ var contentObserver = {
sandbox._broadcastListener_ = function(message) {
// https://github.com/gorhill/uBlock/issues/2014
if ( sandbox.topContentScript ) {
scriptTagFilterer.listener(message);
let details;
try { details = JSON.parse(message.data); } catch (ex) {}
let msg = details && details.msg || {};
if ( msg.what === 'staticFilteringDataChanged' ) {
if ( scriptTagFilterer ) {
scriptTagFilterer.reset();
}
}
}
callback(message.data);
};
@ -475,17 +474,20 @@ var contentObserver = {
if ( !sandbox._messageListener_ ) {
return;
}
// It throws sometimes, mostly when the popup closes
try {
messager.removeMessageListener(
sandbox._sandboxId_,
sandbox._messageListener_
);
} catch (ex) {
}
try {
messager.removeMessageListener(
hostName + ':broadcast',
sandbox._broadcastListener_
);
} catch (ex) {
// It throws sometimes, mostly when the popup closes
}
sandbox._messageListener_ = sandbox._broadcastListener_ = null;
@ -594,6 +596,7 @@ var LocationChangeListener = function(docShell, webProgress) {
return;
}
this.messageManager = mm;
this.webProgress = webProgress;
webProgress.addProgressListener(this, Ci.nsIWebProgress.NOTIFY_LOCATION);
};
@ -614,6 +617,13 @@ LocationChangeListener.prototype.onLocationChange = function(webProgress, reques
});
};
LocationChangeListener.prototype.stop = function() {
if ( this.webProgress ) {
this.webProgress.removeProgressListener(this);
}
this.messageManager = this.webProgress = null;
};
/******************************************************************************/
contentObserver.register();