Merge pull request #5314 from yurydelendik/issue5313

Fixes names collisions in content.js

extensions/firefox/chrome/content.js

@@ -20,79 +20,84 @@
 
 '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');
 
-// Factory that registers/unregisters a constructor as a component.
+  var isRemote = Services.appinfo.processType ===
-function Factory() {}
+    Services.appinfo.PROCESS_TYPE_CONTENT;
-
-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
+// Factory that registers/unregisters a constructor as a component.
-  lockFactory: function lockFactory(lock) {
+  function Factory() {
-    // 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,
+
+    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();
 
-function startup() {
+  function startup() {
-  Cu.import('resource://pdf.js/PdfjsContentUtils.jsm');
+    Cu.import('resource://pdf.js/PdfjsContentUtils.jsm');
-  PdfjsContentUtils.init();
+    PdfjsContentUtils.init();
 
-  Cu.import('resource://pdf.js/PdfStreamConverter.jsm');
+    Cu.import('resource://pdf.js/PdfStreamConverter.jsm');
-  pdfStreamConverterFactory.register(PdfStreamConverter);
+    pdfStreamConverterFactory.register(PdfStreamConverter);
-}
+  }
 
-function shutdown() {
+  function shutdown() {
-  // Remove the contract/component.
+    // Remove the contract/component.
-  pdfStreamConverterFactory.unregister();
+    pdfStreamConverterFactory.unregister();
-  // Unload the converter
+    // Unload the converter
-  Cu.unload('resource://pdf.js/PdfStreamConverter.jsm');
+    Cu.unload('resource://pdf.js/PdfStreamConverter.jsm');
 
-  PdfjsContentUtils.uninit();
+    PdfjsContentUtils.uninit();
-  Cu.unload('resource://pdf.js/PdfjsContentUtils.jsm');
+    Cu.unload('resource://pdf.js/PdfjsContentUtils.jsm');
-}
+  }
 
-if (isRemote) {
+  if (isRemote) {
-  startup();
+    startup();
 
-  addMessageListener('PDFJS:Child:shutdown', function (e) {
+    addMessageListener('PDFJS:Child:shutdown', function (e) {
-    shutdown();
+      shutdown();
-  });
+    });
-}
+  }
+})();