зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1355473 - convert uses of 'defer' to 'new Promise' in client/responsivedesign; r=tromey
MozReview-Commit-ID: L9tNE28knjF --HG-- extra : rebase_source : ef6c02f39b5446df2120b3f0936958d30ee4ef6f
This commit is contained in:
Родитель
cd5f595a60
Коммит
35ad0c68cf
|
@ -142,7 +142,7 @@ function synthesizeClick(element) {
|
|||
}
|
||||
|
||||
function pushPrefs(...aPrefs) {
|
||||
let deferred = promise.defer();
|
||||
SpecialPowers.pushPrefEnv({"set": aPrefs}, deferred.resolve);
|
||||
return deferred.promise;
|
||||
return new Promise(resolve => {
|
||||
SpecialPowers.pushPrefEnv({"set": aPrefs}, resolve);
|
||||
});
|
||||
}
|
||||
|
|
|
@ -130,9 +130,9 @@ var closeToolbox = Task.async(function* () {
|
|||
*/
|
||||
function waitForToolboxFrameFocus(toolbox) {
|
||||
info("Making sure that the toolbox's frame is focused");
|
||||
let def = promise.defer();
|
||||
waitForFocus(def.resolve, toolbox.win);
|
||||
return def.promise;
|
||||
return new Promise(resolve => {
|
||||
waitForFocus(resolve, toolbox.win);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -210,27 +210,27 @@ var addTab = Task.async(function* (url) {
|
|||
* @return promise
|
||||
*/
|
||||
function waitForDocLoadComplete(aBrowser = gBrowser) {
|
||||
let deferred = promise.defer();
|
||||
let progressListener = {
|
||||
onStateChange: function (webProgress, req, flags, status) {
|
||||
let docStop = Ci.nsIWebProgressListener.STATE_IS_NETWORK |
|
||||
Ci.nsIWebProgressListener.STATE_STOP;
|
||||
info(`Saw state ${flags.toString(16)} and status ${status.toString(16)}`);
|
||||
return new Promise(resolve => {
|
||||
let progressListener = {
|
||||
onStateChange: function (webProgress, req, flags, status) {
|
||||
let docStop = Ci.nsIWebProgressListener.STATE_IS_NETWORK |
|
||||
Ci.nsIWebProgressListener.STATE_STOP;
|
||||
info(`Saw state ${flags.toString(16)} and status ${status.toString(16)}`);
|
||||
|
||||
// When a load needs to be retargetted to a new process it is cancelled
|
||||
// with NS_BINDING_ABORTED so ignore that case
|
||||
if ((flags & docStop) == docStop && status != Cr.NS_BINDING_ABORTED) {
|
||||
aBrowser.removeProgressListener(progressListener);
|
||||
info("Browser loaded");
|
||||
deferred.resolve();
|
||||
}
|
||||
},
|
||||
QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
|
||||
// When a load needs to be retargetted to a new process it is cancelled
|
||||
// with NS_BINDING_ABORTED so ignore that case
|
||||
if ((flags & docStop) == docStop && status != Cr.NS_BINDING_ABORTED) {
|
||||
aBrowser.removeProgressListener(progressListener);
|
||||
info("Browser loaded");
|
||||
resolve();
|
||||
}
|
||||
},
|
||||
QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
|
||||
Ci.nsISupportsWeakReference])
|
||||
};
|
||||
aBrowser.addProgressListener(progressListener);
|
||||
info("Waiting for browser load");
|
||||
return deferred.promise;
|
||||
};
|
||||
aBrowser.addProgressListener(progressListener);
|
||||
info("Waiting for browser load");
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Загрузка…
Ссылка в новой задаче