Bug 816957: Fix some issues in the extensions manager when sharing compartments. r=khuey
authorJames Lal <jlal@mozilla.com>
Tue, 11 Dec 2012 13:24:15 -0800
changeset 115686 241296b5355378208a595e661e11f62b083ad60b
parent 115685 149c069986dc674951b125a7657ef1863863a586
child 115687 dd737056538ae6370453c62c2d3b53c143b3245a
push id19488
push userkhuey@mozilla.com
push dateTue, 11 Dec 2012 21:24:35 +0000
treeherdermozilla-inbound@241296b53553 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs816957
milestone20.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 816957: Fix some issues in the extensions manager when sharing compartments. r=khuey
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