Fixes names collisions in content.js

This commit is contained in:
Yury Delendik 2014-09-19 13:58:12 -05:00
parent d66314cfb3
commit dd48d1c352

View File

@ -20,79 +20,84 @@
'use strict'; 'use strict';
const Cc = Components.classes; (function contentScriptClosure() {
const Ci = Components.interfaces; // we need to use closure here -- we are running in the global context
const Cm = Components.manager;
const Cu = Components.utils;
const Cr = Components.results;
Cu.import('resource://gre/modules/XPCOMUtils.jsm'); const Cc = Components.classes;
Cu.import('resource://gre/modules/Services.jsm'); const Ci = Components.interfaces;
const Cm = Components.manager;
const Cu = Components.utils;
const Cr = Components.results;
var isRemote = Services.appinfo.processType === Cu.import('resource://gre/modules/XPCOMUtils.jsm');
Services.appinfo.PROCESS_TYPE_CONTENT; Cu.import('resource://gre/modules/Services.jsm');
var isRemote = Services.appinfo.processType ===
Services.appinfo.PROCESS_TYPE_CONTENT;
// Factory that registers/unregisters a constructor as a component. // Factory that registers/unregisters a constructor as a component.
function Factory() {} function Factory() {
Factory.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory]),
_targetConstructor: null,
register: function register(targetConstructor) {
this._targetConstructor = targetConstructor;
var proto = targetConstructor.prototype;
var registrar = Cm.QueryInterface(Ci.nsIComponentRegistrar);
registrar.registerFactory(proto.classID, proto.classDescription,
proto.contractID, this);
},
unregister: function unregister() {
var proto = this._targetConstructor.prototype;
var registrar = Cm.QueryInterface(Ci.nsIComponentRegistrar);
registrar.unregisterFactory(proto.classID, this);
this._targetConstructor = null;
},
// nsIFactory
createInstance: function createInstance(aOuter, iid) {
if (aOuter !== null) {
throw Cr.NS_ERROR_NO_AGGREGATION;
}
return (new (this._targetConstructor)()).QueryInterface(iid);
},
// nsIFactory
lockFactory: function lockFactory(lock) {
// No longer used as of gecko 1.7.
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
} }
};
var pdfStreamConverterFactory = new Factory(); Factory.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory]),
_targetConstructor: null,
function startup() { register: function register(targetConstructor) {
Cu.import('resource://pdf.js/PdfjsContentUtils.jsm'); this._targetConstructor = targetConstructor;
PdfjsContentUtils.init(); var proto = targetConstructor.prototype;
var registrar = Cm.QueryInterface(Ci.nsIComponentRegistrar);
registrar.registerFactory(proto.classID, proto.classDescription,
proto.contractID, this);
},
Cu.import('resource://pdf.js/PdfStreamConverter.jsm'); unregister: function unregister() {
pdfStreamConverterFactory.register(PdfStreamConverter); var proto = this._targetConstructor.prototype;
} var registrar = Cm.QueryInterface(Ci.nsIComponentRegistrar);
registrar.unregisterFactory(proto.classID, this);
this._targetConstructor = null;
},
function shutdown() { // nsIFactory
// Remove the contract/component. createInstance: function createInstance(aOuter, iid) {
pdfStreamConverterFactory.unregister(); if (aOuter !== null) {
// Unload the converter throw Cr.NS_ERROR_NO_AGGREGATION;
Cu.unload('resource://pdf.js/PdfStreamConverter.jsm'); }
return (new (this._targetConstructor)()).QueryInterface(iid);
},
PdfjsContentUtils.uninit(); // nsIFactory
Cu.unload('resource://pdf.js/PdfjsContentUtils.jsm'); lockFactory: function lockFactory(lock) {
} // No longer used as of gecko 1.7.
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
}
};
if (isRemote) { var pdfStreamConverterFactory = new Factory();
startup();
addMessageListener('PDFJS:Child:shutdown', function (e) { function startup() {
shutdown(); Cu.import('resource://pdf.js/PdfjsContentUtils.jsm');
}); PdfjsContentUtils.init();
}
Cu.import('resource://pdf.js/PdfStreamConverter.jsm');
pdfStreamConverterFactory.register(PdfStreamConverter);
}
function shutdown() {
// Remove the contract/component.
pdfStreamConverterFactory.unregister();
// Unload the converter
Cu.unload('resource://pdf.js/PdfStreamConverter.jsm');
PdfjsContentUtils.uninit();
Cu.unload('resource://pdf.js/PdfjsContentUtils.jsm');
}
if (isRemote) {
startup();
addMessageListener('PDFJS:Child:shutdown', function (e) {
shutdown();
});
}
})();