mirror of
https://github.com/gorhill/uMatrix.git
synced 2024-06-14 16:25:03 +12:00
Use a nsIWebProgressListener instead of a tabsProgressListener for location change monitoring
This commit is contained in:
parent
fd3e24713f
commit
c5546e322f
|
@ -23,10 +23,12 @@
|
|||
|
||||
/******************************************************************************/
|
||||
|
||||
this.EXPORTED_SYMBOLS = ['contentObserver'];
|
||||
this.EXPORTED_SYMBOLS = ['contentObserver', 'LocationChangeListener'];
|
||||
|
||||
const {interfaces: Ci, utils: Cu} = Components;
|
||||
const {Services} = Cu.import('resource://gre/modules/Services.jsm', null);
|
||||
const {XPCOMUtils} = Cu.import('resource://gre/modules/XPCOMUtils.jsm', null);
|
||||
|
||||
const hostName = Services.io.newURI(Components.stack.filename, null, null).host;
|
||||
|
||||
// Cu.import('resource://gre/modules/devtools/Console.jsm');
|
||||
|
@ -65,16 +67,12 @@ const contentObserver = {
|
|||
.getService(Ci.nsICategoryManager);
|
||||
},
|
||||
|
||||
QueryInterface: (function() {
|
||||
let {XPCOMUtils} = Cu.import('resource://gre/modules/XPCOMUtils.jsm', null);
|
||||
|
||||
return XPCOMUtils.generateQI([
|
||||
QueryInterface: XPCOMUtils.generateQI([
|
||||
Ci.nsIFactory,
|
||||
Ci.nsIObserver,
|
||||
Ci.nsIContentPolicy,
|
||||
Ci.nsISupportsWeakReference
|
||||
]);
|
||||
})(),
|
||||
]),
|
||||
|
||||
createInstance: function(outer, iid) {
|
||||
if ( outer ) {
|
||||
|
@ -309,6 +307,36 @@ const contentObserver = {
|
|||
|
||||
/******************************************************************************/
|
||||
|
||||
const locationChangedMessageName = hostName + ':locationChanged';
|
||||
|
||||
const LocationChangeListener = function(docShell) {
|
||||
if (docShell) {
|
||||
docShell.QueryInterface(Ci.nsIInterfaceRequestor);
|
||||
|
||||
this.docShell = docShell.getInterface(Ci.nsIWebProgress);
|
||||
this.messageManager = docShell.getInterface(Ci.nsIContentFrameMessageManager);
|
||||
|
||||
if (this.messageManager && typeof this.messageManager.sendAsyncMessage === 'function') {
|
||||
this.docShell.addProgressListener(this, Ci.nsIWebProgress.NOTIFY_ALL);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
LocationChangeListener.prototype.QueryInterface = XPCOMUtils.generateQI(["nsIWebProgressListener", "nsISupportsWeakReference"]);
|
||||
|
||||
LocationChangeListener.prototype.onLocationChange = function(webProgress, request, location, flags) {
|
||||
if ( !webProgress.isTopLevel ) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.messageManager.sendAsyncMessage(locationChangedMessageName, {
|
||||
url: location.asciiSpec,
|
||||
flags: flags,
|
||||
});
|
||||
};
|
||||
|
||||
/******************************************************************************/
|
||||
|
||||
contentObserver.register();
|
||||
|
||||
/******************************************************************************/
|
||||
|
|
Loading…
Reference in a new issue