Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-22 02:09:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1484466: Part 2a - Remove no-op generateCI calls. r=mccr8

Browse Source 
These stopped having any effect when we switched to ChromeUtils.generateQI,
which does not support automatic nsIClassInfo forwarding.

Differential Revision: https://phabricator.services.mozilla.com/D3707

--HG--
extra : rebase_source : 62a3690304ad7baa760c41eba777aa17b9af33f0
This commit is contained in:
Kris Maglione 2018-08-18 12:38:31 -07:00
parent 880dd37f97
commit 56f4830bf8
5 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/console/ConsoleAPIStorage.js
View File

@ -46,12 +46,6 @@ ConsoleAPIStorageService.prototype = {
classID : CONSOLEAPISTORAGE_CID,
QueryInterface: ChromeUtils.generateQI([Ci.nsIConsoleAPIStorage,
Ci.nsIObserver]),
classInfo: XPCOMUtils.generateCI({
classID: CONSOLEAPISTORAGE_CID,
contractID: '@mozilla.org/consoleAPI-storage;1',
interfaces: [Ci.nsIConsoleAPIStorage, Ci.nsIObserver],
flags: Ci.nsIClassInfo.SINGLETON
}),
observe: function CS_observe(aSubject, aTopic, aData)
{

6
dom/media/webvtt/WebVTTParserWrapper.js
View File

@ -6,7 +6,6 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://gre/modules/vtt.jsm");
var WEBVTTPARSERWRAPPER_CID = "{acf6e493-0092-4b26-b172-241e375c57ab}";
var WEBVTTPARSERWRAPPER_CONTRACTID = "@mozilla.org/webvttParserWrapper;1";
function WebVTTParserWrapper()
{
@ -60,11 +59,6 @@ WebVTTParserWrapper.prototype =
classDescription: "Wrapper for the JS WebVTT implementation (vtt.js)",
classID: Components.ID(WEBVTTPARSERWRAPPER_CID),
QueryInterface: ChromeUtils.generateQI([Ci.nsIWebVTTParserWrapper]),
classInfo: XPCOMUtils.generateCI({
classID: WEBVTTPARSERWRAPPER_CID,
contractID: WEBVTTPARSERWRAPPER_CONTRACTID,
interfaces: [Ci.nsIWebVTTParserWrapper]
})
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([WebVTTParserWrapper]);

5
toolkit/components/captivedetect/captivedetect.js
View File

@ -12,7 +12,6 @@ XPCOMUtils.defineLazyGlobalGetters(this, ["XMLHttpRequest"]);
const DEBUG = false; // set to true to show debug messages
const kCAPTIVEPORTALDETECTOR_CONTRACTID = "@mozilla.org/toolkit/captive-detector;1";
const kCAPTIVEPORTALDETECTOR_CID = Components.ID("{d9cd00ba-aa4d-47b1-8792-b1fe0cd35060}");
const kOpenCaptivePortalLoginEvent = "captive-portal-login";
@ -224,10 +223,6 @@ function CaptivePortalDetector() {
CaptivePortalDetector.prototype = {
classID: kCAPTIVEPORTALDETECTOR_CID,
classInfo: XPCOMUtils.generateCI({classID: kCAPTIVEPORTALDETECTOR_CID,
contractID: kCAPTIVEPORTALDETECTOR_CONTRACTID,
classDescription: "Captive Portal Detector",
interfaces: [Ci.nsICaptivePortalDetector]}),
QueryInterface: ChromeUtils.generateQI([Ci.nsICaptivePortalDetector]),
// nsICaptivePortalDetector

5
toolkit/components/xulstore/XULStore.js
View File

@ -9,7 +9,6 @@ const debugMode = false;
// 30 seconds normally, or 3 seconds for testing
const WRITE_DELAY_MS = (debugMode ? 3 : 30) * 1000;
const XULSTORE_CONTRACTID = "@mozilla.org/xul/xulstore;1";
const XULSTORE_CID = Components.ID("{6f46b6f4-c8b1-4bd4-a4fa-9ebbed0753ea}");
const STOREDB_FILENAME = "xulstore.json";
@ -25,10 +24,6 @@ function XULStore() {
XULStore.prototype = {
classID: XULSTORE_CID,
classInfo: XPCOMUtils.generateCI({classID: XULSTORE_CID,
contractID: XULSTORE_CONTRACTID,
classDescription: "XULStore",
interfaces: [Ci.nsIXULStore]}),
QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver, Ci.nsIXULStore,
Ci.nsISupportsWeakReference]),
_xpcom_factory: XPCOMUtils.generateSingletonFactory(XULStore),

7
toolkit/mozapps/update/nsUpdateService.js
View File

@ -15,7 +15,6 @@ ChromeUtils.import("resource://gre/modules/AppConstants.jsm", this);
XPCOMUtils.defineLazyGlobalGetters(this, ["DOMParser", "XMLHttpRequest"]);
const UPDATESERVICE_CID = Components.ID("{B3C290A6-3943-4B89-8BBE-C01EB7B3B311}");
const UPDATESERVICE_CONTRACTID = "@mozilla.org/updates/update-service;1";
const PREF_APP_UPDATE_ALTWINDOWTYPE = "app.update.altwindowtype";
const PREF_APP_UPDATE_AUTO = "app.update.auto";
@ -2466,12 +2465,6 @@ UpdateService.prototype = {
},
classID: UPDATESERVICE_CID,
classInfo: XPCOMUtils.generateCI({classID: UPDATESERVICE_CID,
contractID: UPDATESERVICE_CONTRACTID,
interfaces: [Ci.nsIApplicationUpdateService,
Ci.nsITimerCallback,
Ci.nsIObserver],
flags: Ci.nsIClassInfo.SINGLETON}),
_xpcom_factory: UpdateServiceFactory,
QueryInterface: ChromeUtils.generateQI([Ci.nsIApplicationUpdateService,