Bug 816957 - Fix some issues in the extensions manager when sharing compartments. r=khuey, a=sicking
authorJames Lal <jlal@mozilla.com>
Tue, 11 Dec 2012 13:24:15 -0800
changeset 118841 c0ed4a465b7afd4dc251a53a64d850d4af486235
parent 118840 4e00b7fbaa9062cd67632755c1ba8423858e220e
child 118842 2bbaa47b999ea92827111c2bcb4b62cf144e23b4
push id2961
push userryanvm@gmail.com
push dateFri, 14 Dec 2012 03:05:01 +0000
treeherdermozilla-aurora@d0a8a8173ef1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey, sicking
bugs816957
milestone19.0a2
Bug 816957 - Fix some issues in the extensions manager when sharing compartments. r=khuey, a=sicking
toolkit/mozapps/extensions/XPIProviderUtils.js
--- a/toolkit/mozapps/extensions/XPIProviderUtils.js
+++ b/toolkit/mozapps/extensions/XPIProviderUtils.js
@@ -73,20 +73,16 @@ const PROP_LOCALE_MULTI  = ["developers"
 const PROP_TARGETAPP     = ["id", "minVersion", "maxVersion"];
 
 
 
 const PREFIX_ITEM_URI                 = "urn:mozilla:item:";
 const RDFURI_ITEM_ROOT                = "urn:mozilla:item:root"
 const PREFIX_NS_EM                    = "http://www.mozilla.org/2004/em-rdf#";
 
-
-var XPIProvider;
-
-
 this.__defineGetter__("gRDF", function gRDFGetter() {
   delete this.gRDF;
   return this.gRDF = Cc["@mozilla.org/rdf/rdf-service;1"].
                      getService(Ci.nsIRDFService);
 });
 
 function EM_R(aProperty) {
   return gRDF.GetResource(PREFIX_NS_EM + aProperty);
@@ -292,17 +288,17 @@ function copyRowProperties(aRow, aProper
   if (!aTarget)
     aTarget = {};
   aProperties.forEach(function(aProp) {
     aTarget[aProp] = aRow.getResultByName(aProp);
   });
   return aTarget;
 }
 
-var XPIDatabase = {
+this.XPIDatabase = {
   // true if the database connection has been opened
   initialized: false,
   // A cache of statements that are used and need to be finalized on shutdown
   statementCache: {},
   // A cache of weak referenced DBAddonInternals so we can reuse objects where
   // possible
   addonCache: [],
   // The nested transaction count