зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1243549 - Add missing bits. r=post-facto
MozReview-Commit-ID: BTRUMtNsSeQ
This commit is contained in:
Родитель
3098c7e1bf
Коммит
0bffcc3559
|
@ -694,21 +694,22 @@ Sanitizer.sanitize = function(aParentWindow)
|
|||
Sanitizer.onStartup = Task.async(function*() {
|
||||
// Make sure that we are triggered during shutdown, at the right time,
|
||||
// and only once.
|
||||
let placesClient = Cc["@mozilla.org/browser/nav-history-service;1"] .getService(Ci.nsPIPlacesDatabase)
|
||||
let placesClient = Cc["@mozilla.org/browser/nav-history-service;1"]
|
||||
.getService(Ci.nsPIPlacesDatabase)
|
||||
.shutdownClient
|
||||
.jsclient;
|
||||
|
||||
let deferredSanitization = PromiseUtils.defer();
|
||||
let sanitizationInProgress = false;
|
||||
let doSanitize = function() {
|
||||
if (sanitizationInProgress) {
|
||||
return deferredSanitization.promise;
|
||||
}
|
||||
if (!sanitizationInProgress) {
|
||||
sanitizationInProgress = true;
|
||||
Sanitizer.onShutdown().catch(er => {Promise.reject(er) /* Do not return rejected promise */;}).then(() =>
|
||||
deferredSanitization.resolve()
|
||||
);
|
||||
}
|
||||
return deferredSanitization.promise;
|
||||
}
|
||||
placesClient.addBlocker("sanitize.js: Sanitize on shutdown", doSanitize);
|
||||
|
||||
// Handle incomplete sanitizations
|
||||
|
|
Загрузка…
Ссылка в новой задаче