wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1163049, alternate patch - make .syncGUID a lazy getter to avoid initializing NSS during the startup sequence, r=rnewman

Browse Source
This commit is contained in:
Benjamin Smedberg 2015-05-22 12:36:26 -04:00
parent 513b7e7c8b
commit 6dbb3a5e1e
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
toolkit/mozapps/extensions/internal/XPIProvider.jsm
View File

@ -1003,20 +1003,35 @@ function loadManifestFromRDF(aUri, aStream) {
addon.targetPlatforms = [];
}
// Load the storage service before NSS (nsIRandomGenerator),
// to avoid a SQLite initialization error (bug 717904).
let storage = Services.storage;
// Define .syncGUID as a lazy property which is also settable
Object.defineProperty(addon, "syncGUID", {
get: () => {
// Load the storage service before NSS (nsIRandomGenerator),
// to avoid a SQLite initialization error (bug 717904).
let storage = Services.storage;
// Generate random GUID used for Sync.
// This was lifted from util.js:makeGUID() from services-sync.
let rng = Cc["@mozilla.org/security/random-generator;1"].
createInstance(Ci.nsIRandomGenerator);
let bytes = rng.generateRandomBytes(9);
let byte_string = [String.fromCharCode(byte) for each (byte in bytes)]
.join("");
// Base64 encode
addon.syncGUID = btoa(byte_string).replace(/\+/g, '-')
.replace(/\//g, '_');
// Generate random GUID used for Sync.
// This was lifted from util.js:makeGUID() from services-sync.
let rng = Cc["@mozilla.org/security/random-generator;1"].
createInstance(Ci.nsIRandomGenerator);
let bytes = rng.generateRandomBytes(9);
let byte_string = [String.fromCharCode(byte) for each (byte in bytes)]
.join("");
// Base64 encode
let guid = btoa(byte_string).replace(/\+/g, '-')
.replace(/\//g, '_');
delete addon.syncGUID;
addon.syncGUID = guid;
return guid;
},
set: (val) => {
delete addon.syncGUID;
addon.syncGUID = val;
},
configurable: true,
enumerable: true,
});
return addon;
}