Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5314 from yurydelendik/issue5313

Browse Source 
Fixes names collisions in content.js
This commit is contained in:
Brendan Dahl 2014-09-23 14:01:53 -07:00
commit 678fb0ea9f
1 changed files with 69 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
extensions/firefox/chrome/content.js
View File

@ -20,22 +20,26 @@
'use strict';
const Cc = Components.classes;
const Ci = Components.interfaces;
const Cm = Components.manager;
const Cu = Components.utils;
const Cr = Components.results;
(function contentScriptClosure() {
// we need to use closure here -- we are running in the global context
Cu.import('resource://gre/modules/XPCOMUtils.jsm');
Cu.import('resource://gre/modules/Services.jsm');
const Cc = Components.classes;
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');
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.
function Factory() {}
function Factory() {
}
Factory.prototype = {
Factory.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory]),
_targetConstructor: null,
@ -67,19 +71,19 @@ Factory.prototype = {
// No longer used as of gecko 1.7.
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
}
};
};
var pdfStreamConverterFactory = new Factory();
var pdfStreamConverterFactory = new Factory();
function startup() {
function startup() {
Cu.import('resource://pdf.js/PdfjsContentUtils.jsm');
PdfjsContentUtils.init();
Cu.import('resource://pdf.js/PdfStreamConverter.jsm');
pdfStreamConverterFactory.register(PdfStreamConverter);
}
}
function shutdown() {
function shutdown() {
// Remove the contract/component.
pdfStreamConverterFactory.unregister();
// Unload the converter
@ -87,12 +91,13 @@ function shutdown() {
PdfjsContentUtils.uninit();
Cu.unload('resource://pdf.js/PdfjsContentUtils.jsm');
}
}
if (isRemote) {
if (isRemote) {
startup();
addMessageListener('PDFJS:Child:shutdown', function (e) {
shutdown();
});
}
}
})();