Bug 1316718 - Remove ExtensionContent from mozbrowser startup. r=fabrice
authorJ. Ryan Stinnett <jryans@gmail.com>
Thu, 10 Nov 2016 15:38:26 -0600
changeset 439681 6c48b4a38d709179613ca43afa8366c2d15c2089
parent 439680 2b4c107f00d2f42d305e00f97fce69eaf1dcb44a
child 439682 b227cc95b6d95e8307ddab63f21db842d1041364
push id36064
push userrthijssen@mozilla.com
push dateWed, 16 Nov 2016 13:38:27 +0000
reviewersfabrice
bugs1316718
milestone53.0a1
Bug 1316718 - Remove ExtensionContent from mozbrowser startup. r=fabrice MozReview-Commit-ID: 4I5Ox1cQdIg
dom/browser-element/BrowserElementChildPreload.js
dom/browser-element/BrowserElementParent.js
dom/ipc/extensions.js
dom/ipc/jar.mn
--- a/dom/browser-element/BrowserElementChildPreload.js
+++ b/dom/browser-element/BrowserElementChildPreload.js
@@ -12,17 +12,16 @@ debug("loaded");
 
 var BrowserElementIsReady;
 
 var { classes: Cc, interfaces: Ci, results: Cr, utils: Cu }  = Components;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/BrowserElementPromptService.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
-Cu.import("resource://gre/modules/ExtensionContent.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(this, "acs",
                                    "@mozilla.org/audiochannel/service;1",
                                    "nsIAudioChannelService");
 XPCOMUtils.defineLazyModuleGetter(this, "ManifestFinder",
                                   "resource://gre/modules/ManifestFinder.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "ManifestObtainer",
                                   "resource://gre/modules/ManifestObtainer.jsm");
--- a/dom/browser-element/BrowserElementParent.js
+++ b/dom/browser-element/BrowserElementParent.js
@@ -314,17 +314,16 @@ BrowserElementParent.prototype = {
       }
     }
     delete this._pendingAPICalls;
   },
 
   _setupMessageListener: function() {
     this._mm = this._frameLoader.messageManager;
     this._mm.addMessageListener('browser-element-api:call', this);
-    this._mm.loadFrameScript("chrome://global/content/extensions.js", true);
   },
 
   receiveMessage: function(aMsg) {
     if (!this._isAlive()) {
       return;
     }
 
     // Messages we receive are handed to functions which take a (data) argument,
deleted file mode 100644
--- a/dom/ipc/extensions.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-function debug(msg) {
-  // dump("extensions - " + msg + "\n");
-}
-
-debug("loaded");
-
-ExtensionContent.init(this);
-
-addEventListener("unload", () => {
-  ExtensionContent.uninit(this);
-});
--- a/dom/ipc/jar.mn
+++ b/dom/ipc/jar.mn
@@ -3,11 +3,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 toolkit.jar:
         content/global/test-ipc.xul (test.xul)
         content/global/remote-test-ipc.js (remote-test.js)
         content/global/BrowserElementChild.js (../browser-element/BrowserElementChild.js)
         content/global/BrowserElementChildPreload.js (../browser-element/BrowserElementChildPreload.js)
         content/global/BrowserElementCopyPaste.js (../browser-element/BrowserElementCopyPaste.js)
-        content/global/extensions.js (extensions.js)
         content/global/manifestMessages.js (manifestMessages.js)
         content/global/preload.js (preload.js)