Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 23:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 943517 - Remove the deprecated-sync-thenables from the debugger server;r=jlong

Browse Source
This commit is contained in:
Eddy Bruël 2015-05-12 19:13:56 +02:00
parent 1c6bb60c9a
commit 2c746d880a
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
toolkit/devtools/server/actors/script.js
View File

@ -18,8 +18,6 @@ const PromiseDebugging = require("PromiseDebugging");
const xpcInspector = require("xpcInspector");
const ScriptStore = require("./utils/ScriptStore");
const { defer, resolve, reject, all } = require("devtools/toolkit/deprecated-sync-thenables");
loader.lazyGetter(this, "Debugger", () => {
let Debugger = require("Debugger");
hackDebugger(Debugger);
@ -766,7 +764,7 @@ ThreadActor.prototype = {
line: originalLocation.originalLine,
column: originalLocation.originalColumn
};
resolve(onPacket(packet))
Promise.resolve(onPacket(packet))
.then(null, error => {
reportError(error);
return {
@ -941,8 +939,8 @@ ThreadActor.prototype = {
_handleResumeLimit: function (aRequest) {
let steppingType = aRequest.resumeLimit.type;
if (["break", "step", "next", "finish"].indexOf(steppingType) == -1) {
return reject({ error: "badParameterType",
message: "Unknown resumeLimit type" });
return Promise.reject({ error: "badParameterType",
message: "Unknown resumeLimit type" });
}
const generatedLocation = this.sources.getFrameLocation(this.youngestFrame);
@ -1055,7 +1053,7 @@ ThreadActor.prototype = {
resumeLimitHandled = this._handleResumeLimit(aRequest)
} else {
this._clearSteppingHooks(this.youngestFrame);
resumeLimitHandled = resolve(true);
resumeLimitHandled = Promise.resolve(true);
}
return resumeLimitHandled.then(() => {
@ -1317,7 +1315,7 @@ ThreadActor.prototype = {
promises.push(promise);
}
return all(promises).then(function () {
return Promise.all(promises).then(function () {
return { frames: frames };
});
},
@ -1357,8 +1355,8 @@ ThreadActor.prototype = {
}
}
return all([this.sources.createSourceActors(script.source)
for (script of sourcesToScripts.values())]);
return Promise.all([this.sources.createSourceActors(script.source)
for (script of sourcesToScripts.values())]);
},
onSources: function (aRequest) {
@ -2510,7 +2508,7 @@ SourceActor.prototype = {
* Handler for the "source" packet.
*/
onSource: function () {
return resolve(this._init)
return Promise.resolve(this._init)
.then(this._getSourceText)
.then(({ content, contentType }) => {
return {