Bug 1072980 - Don't pass CPOW as notificationCallbacks in nsIAboutProtocol shim (r=ally)
authorBill McCloskey <wmccloskey@mozilla.com>
Thu, 18 Dec 2014 17:34:23 -0800
changeset 220539 623ccb80dadbe7f3fcd3178de8c7097c433ac467
parent 220538 54c47a1c8880329212049e2fc1f30078b4b4ecae
child 220540 8dc69a6656b240eb7b470fbc705513983b37cbad
push id10503
push userryanvm@gmail.com
push dateFri, 19 Dec 2014 20:13:42 +0000
treeherderfx-team@98ee95ac6be5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersally
bugs1072980
milestone37.0a1
Bug 1072980 - Don't pass CPOW as notificationCallbacks in nsIAboutProtocol shim (r=ally)
toolkit/components/addoncompat/RemoteAddonsChild.jsm
toolkit/components/addoncompat/RemoteAddonsParent.jsm
--- a/toolkit/components/addoncompat/RemoteAddonsChild.jsm
+++ b/toolkit/components/addoncompat/RemoteAddonsChild.jsm
@@ -197,19 +197,16 @@ AboutProtocolChannel.prototype = {
 
   asyncOpen: function(listener, context) {
     // Ask the parent to synchronously read all the data from the channel.
     let cpmm = Cc["@mozilla.org/childprocessmessagemanager;1"]
                .getService(Ci.nsISyncMessageSender);
     let rval = cpmm.sendRpcMessage("Addons:AboutProtocol:OpenChannel", {
       uri: this.URI.spec,
       contractID: this._contractID
-    }, {
-      notificationCallbacks: this.notificationCallbacks,
-      loadGroupNotificationCallbacks: this.loadGroup ? this.loadGroup.notificationCallbacks : null,
     });
 
     if (rval.length != 1) {
       throw Cr.NS_ERROR_FAILURE;
     }
 
     let {data, contentType} = rval[0];
     this.contentType = contentType;
--- a/toolkit/components/addoncompat/RemoteAddonsParent.jsm
+++ b/toolkit/components/addoncompat/RemoteAddonsParent.jsm
@@ -235,22 +235,18 @@ let AboutProtocolParent = {
   // We immediately read all the data out of the channel here and
   // return it to the child.
   openChannel: function(msg) {
     let uri = BrowserUtils.makeURI(msg.data.uri);
     let contractID = msg.data.contractID;
     let module = Cc[contractID].getService(Ci.nsIAboutModule);
     try {
       let channel = module.newChannel(uri, null);
-      channel.notificationCallbacks = msg.objects.notificationCallbacks;
-      if (msg.objects.loadGroupNotificationCallbacks) {
-        channel.loadGroup = {notificationCallbacks: msg.objects.loadGroupNotificationCallbacks};
-      } else {
-        channel.loadGroup = null;
-      }
+      channel.notificationCallbacks = null;
+      channel.loadGroup = null;
       let stream = channel.open();
       let data = NetUtil.readInputStreamToString(stream, stream.available(), {});
       return {
         data: data,
         contentType: channel.contentType
       };
     } catch (e) {
       Cu.reportError(e);