Bug 1072980 - Don't pass CPOW as notificationCallbacks in nsIAboutProtocol shim (r=ally)

This commit is contained in:
Bill McCloskey 2014-12-18 17:34:23 -08:00
Родитель aacd3e1553
Коммит 727e608675
2 изменённых файлов: 2 добавлений и 9 удалений

Просмотреть файл

@ -202,9 +202,6 @@ AboutProtocolChannel.prototype = {
let rval = cpmm.sendRpcMessage("Addons:AboutProtocol:OpenChannel", { let rval = cpmm.sendRpcMessage("Addons:AboutProtocol:OpenChannel", {
uri: this.URI.spec, uri: this.URI.spec,
contractID: this._contractID contractID: this._contractID
}, {
notificationCallbacks: this.notificationCallbacks,
loadGroupNotificationCallbacks: this.loadGroup ? this.loadGroup.notificationCallbacks : null,
}); });
if (rval.length != 1) { if (rval.length != 1) {

Просмотреть файл

@ -240,12 +240,8 @@ let AboutProtocolParent = {
let module = Cc[contractID].getService(Ci.nsIAboutModule); let module = Cc[contractID].getService(Ci.nsIAboutModule);
try { try {
let channel = module.newChannel(uri, null); let channel = module.newChannel(uri, null);
channel.notificationCallbacks = msg.objects.notificationCallbacks; channel.notificationCallbacks = null;
if (msg.objects.loadGroupNotificationCallbacks) { channel.loadGroup = null;
channel.loadGroup = {notificationCallbacks: msg.objects.loadGroupNotificationCallbacks};
} else {
channel.loadGroup = null;
}
let stream = channel.open(); let stream = channel.open();
let data = NetUtil.readInputStreamToString(stream, stream.available(), {}); let data = NetUtil.readInputStreamToString(stream, stream.available(), {});
return { return {