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 1239276 - Convert DebuggerClient.connect to promise. r=jryans

Browse Source
This commit is contained in:
Alexandre Poirot 2016-01-28 10:11:31 -08:00
parent 8b80dda3a0
commit b53b12bcab
188 changed files with 247 additions and 308 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devtools/client/aboutdebugging/aboutdebugging.js
View File

@ -105,7 +105,7 @@ var AboutDebugging = {
DebuggerServer.allowChromeProcess = true;
this.client = new DebuggerClient(DebuggerServer.connectPipe());
this.client.connect(() => {
this.client.connect().then(() => {
// Show the first available tab.
this.showTab();
window.addEventListener("hashchange", () => this.showTab());

2
devtools/client/debugger/test/mochitest/browser_dbg_addonactor.js
View File

@ -16,7 +16,7 @@ function test() {
let transport = DebuggerServer.connectPipe();
gClient = new DebuggerClient(transport);
gClient.connect((aType, aTraits) => {
gClient.connect().then(([aType, aTraits]) => {
is(aType, "browser",
"Root actor should identify itself as a browser.");

2
devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-event-01.js
View File

@ -17,7 +17,7 @@ function test() {
let transport = DebuggerServer.connectPipe();
gClient = new DebuggerClient(transport);
gClient.connect((aType, aTraits) => {
gClient.connect().then(([aType, aTraits]) => {
is(aType, "browser",
"Root actor should identify itself as a browser.");

2
devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-event-02.js
View File

@ -18,7 +18,7 @@ function test() {
let transport = DebuggerServer.connectPipe();
gClient = new DebuggerClient(transport);
gClient.connect((aType, aTraits) => {
gClient.connect().then(([aType, aTraits]) => {
is(aType, "browser",
"Root actor should identify itself as a browser.");

2
devtools/client/debugger/test/mochitest/browser_dbg_break-on-dom-event-03.js
View File

@ -17,7 +17,7 @@ function test() {
let transport = DebuggerServer.connectPipe();
gClient = new DebuggerClient(transport);
gClient.connect((aType, aTraits) => {
gClient.connect().then(([aType, aTraits]) => {
is(aType, "browser",
"Root actor should identify itself as a browser.");

2
devtools/client/debugger/test/mochitest/browser_dbg_chrome-debugging.js
View File

@ -27,7 +27,7 @@ function test() {
let transport = DebuggerServer.connectPipe();
gClient = new DebuggerClient(transport);
gClient.connect((aType, aTraits) => {
gClient.connect().then(([aType, aTraits]) => {
is(aType, "browser",
"Root actor should identify itself as a browser.");

2
devtools/client/debugger/test/mochitest/browser_dbg_debugger-statement.js
View File

@ -18,7 +18,7 @@ function test() {
let transport = DebuggerServer.connectPipe();
gClient = new DebuggerClient(transport);
gClient.connect((aType, aTraits) => {
gClient.connect().then(([aType, aTraits]) => {
is(aType, "browser",
"Root actor should identify itself as a browser.");

2
devtools/client/debugger/test/mochitest/browser_dbg_event-listeners-01.js
View File

@ -18,7 +18,7 @@ function test() {
let transport = DebuggerServer.connectPipe();
gClient = new DebuggerClient(transport);
gClient.connect((aType, aTraits) => {
gClient.connect().then(([aType, aTraits]) => {
is(aType, "browser",
"Root actor should identify itself as a browser.");

2
devtools/client/debugger/test/mochitest/browser_dbg_event-listeners-02.js
View File

@ -19,7 +19,7 @@ function test() {
let transport = DebuggerServer.connectPipe();
gClient = new DebuggerClient(transport);
gClient.connect((aType, aTraits) => {
gClient.connect().then(([aType, aTraits]) => {
is(aType, "browser",
"Root actor should identify itself as a browser.");

2
devtools/client/debugger/test/mochitest/browser_dbg_event-listeners-03.js
View File

@ -19,7 +19,7 @@ function test() {
let transport = DebuggerServer.connectPipe();
gClient = new DebuggerClient(transport);
gClient.connect((aType, aTraits) => {
gClient.connect().then(([aType, aTraits]) => {
is(aType, "browser",
"Root actor should identify itself as a browser.");

2
devtools/client/debugger/test/mochitest/browser_dbg_globalactor.js
View File

@ -20,7 +20,7 @@ function test() {
let transport = DebuggerServer.connectPipe();
gClient = new DebuggerClient(transport);
gClient.connect((aType, aTraits) => {
gClient.connect().then(([aType, aTraits]) => {
is(aType, "browser",
"Root actor should identify itself as a browser.");

2
devtools/client/debugger/test/mochitest/browser_dbg_listaddons.js
View File

@ -17,7 +17,7 @@ function test() {
let transport = DebuggerServer.connectPipe();
gClient = new DebuggerClient(transport);
gClient.connect((aType, aTraits) => {
gClient.connect().then(([aType, aTraits]) => {
is(aType, "browser",
"Root actor should identify itself as a browser.");

2
devtools/client/debugger/test/mochitest/browser_dbg_listtabs-01.js
View File

@ -18,7 +18,7 @@ function test() {
let transport = DebuggerServer.connectPipe();
gClient = new DebuggerClient(transport);
gClient.connect((aType, aTraits) => {
gClient.connect().then(([aType, aTraits]) => {
is(aType, "browser",
"Root actor should identify itself as a browser.");

2
devtools/client/debugger/test/mochitest/browser_dbg_listtabs-03.js
View File

@ -17,7 +17,7 @@ function test() {
let transport = DebuggerServer.connectPipe();
gClient = new DebuggerClient(transport);
gClient.connect(Task.async(function*(aType, aTraits) {
gClient.connect().then(Task.async(function*([aType, aTraits]) {
is(aType, "browser",
"Root actor should identify itself as a browser.");
let tab = yield addTab(TAB1_URL);

2
devtools/client/debugger/test/mochitest/browser_dbg_multiple-windows.js
View File

@ -20,7 +20,7 @@ function test() {
let transport = DebuggerServer.connectPipe();
gClient = new DebuggerClient(transport);
gClient.connect((aType, aTraits) => {
gClient.connect().then(([aType, aTraits]) => {
is(aType, "browser",
"Root actor should identify itself as a browser.");

2
devtools/client/debugger/test/mochitest/browser_dbg_navigation.js
View File

@ -18,7 +18,7 @@ function test() {
let transport = DebuggerServer.connectPipe();
gClient = new DebuggerClient(transport);
gClient.connect((aType, aTraits) => {
gClient.connect().then(([aType, aTraits]) => {
is(aType, "browser",
"Root actor should identify itself as a browser.");

2
devtools/client/debugger/test/mochitest/browser_dbg_tabactor-01.js
View File

@ -21,7 +21,7 @@ function test() {
let transport = DebuggerServer.connectPipe();
gClient = new DebuggerClient(transport);
gClient.connect((aType, aTraits) => {
gClient.connect().then(([aType, aTraits]) => {
is(aType, "browser",
"Root actor should identify itself as a browser.");

2
devtools/client/debugger/test/mochitest/browser_dbg_tabactor-02.js
View File

@ -21,7 +21,7 @@ function test() {
let transport = DebuggerServer.connectPipe();
gClient = new DebuggerClient(transport);
gClient.connect((aType, aTraits) => {
gClient.connect().then(([aType, aTraits]) => {
is(aType, "browser",
"Root actor should identify itself as a browser.");

10
devtools/client/debugger/test/mochitest/head.js
View File

@ -564,9 +564,7 @@ AddonDebugger.prototype = {
let transport = DebuggerServer.connectPipe();
this.client = new DebuggerClient(transport);
let connected = promise.defer();
this.client.connect(connected.resolve);
yield connected.promise;
yield this.client.connect();
let addonActor = yield getAddonActorForUrl(this.client, aUrl);
@ -1005,11 +1003,7 @@ function generateMouseClickInTab(tab, path) {
function connect(client) {
info("Connecting client.");
return new Promise(function (resolve) {
client.connect(function () {
resolve();
});
});
return client.connect();
}
function close(client) {

10
devtools/client/framework/connect/connect.js
View File

@ -74,20 +74,14 @@ var submit = Task.async(function*() {
gClient = new DebuggerClient(transport);
let delay = Services.prefs.getIntPref("devtools.debugger.remote-timeout");
gConnectionTimeout = setTimeout(handleConnectionTimeout, delay);
let response = yield clientConnect();
let response = yield gClient.connect();
yield onConnectionReady(...response);
});
function clientConnect() {
let deferred = promise.defer();
gClient.connect((...args) => deferred.resolve(args));
return deferred.promise;
}
/**
* Connection is ready. List actors and build buttons.
*/
var onConnectionReady = Task.async(function*(aType, aTraits) {
var onConnectionReady = Task.async(function*([aType, aTraits]) {
clearTimeout(gConnectionTimeout);
let response = yield gClient.listAddons();

2
devtools/client/framework/gDevTools.jsm
View File

@ -731,7 +731,7 @@ var gDevToolsBrowser = {
let client = new DebuggerClient(transport);
let deferred = promise.defer();
client.connect(() => {
client.connect().then(() => {
client.mainRoot.listProcesses(response => {
// Do nothing if there is only one process, the parent process.
let contentProcesses = response.processes.filter(p => (!p.parent));

6
devtools/client/framework/target.js
View File

@ -414,12 +414,12 @@ TabTarget.prototype = {
};
if (this.isLocalTab) {
this._client.connect(() => {
this._client.getTab({ tab: this.tab }).then(response => {
this._client.connect()
.then(() => this._client.getTab({ tab: this.tab }))
.then(response => {
this._form = response.tab;
attachTab();
});
});
} else if (this.isTabActor) {
// In the remote debugging case, the protocol connection will have been
// already initialized in the connection screen code.

6
devtools/client/framework/test/browser_toolbox_tool_remote_reopen.js
View File

@ -73,11 +73,7 @@ function getClient() {
let transport = DebuggerServer.connectPipe();
let client = new DebuggerClient(transport);
client.connect(() => {
deferred.resolve(client);
});
return deferred.promise;
return client.connect().then(() => client);
}
function getTarget(client) {

6
devtools/client/framework/test/browser_two_tabs.js
View File

@ -44,15 +44,15 @@ function openTabs() {
function connect() {
// Connect to debugger server to fetch the two tab actors
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(() => {
gClient.listTabs(response => {
gClient.connect()
.then(() => gClient.listTabs())
.then(response => {
// Fetch the tab actors for each tab
gTabActor1 = response.tabs.filter(a => a.url === TAB_URL_1)[0];
gTabActor2 = response.tabs.filter(a => a.url === TAB_URL_2)[0];
checkGetTab();
});
});
}
function checkGetTab() {

6
devtools/client/framework/test/head.js
View File

@ -29,11 +29,11 @@ function getChromeActors(callback)
DebuggerServer.allowChromeProcess = true;
let client = new DebuggerClient(DebuggerServer.connectPipe());
client.connect(() => {
client.getProcess().then(response => {
client.connect()
.then(() => client.getProcess())
.then(response => {
callback(client, response.form);
});
});
SimpleTest.registerCleanupFunction(() => {
DebuggerServer.destroy();

2
devtools/client/framework/toolbox-process-window.js
View File

@ -33,7 +33,7 @@ var connect = Task.async(function*() {
port: Prefs.chromeDebuggingPort
});
gClient = new DebuggerClient(transport);
gClient.connect(() => {
gClient.connect().then(() => {
let addonID = getParameterByName("addonID");
if (addonID) {

18
devtools/client/scratchpad/scratchpad.js
View File

@ -2193,8 +2193,6 @@ ScratchpadWindow.prototype = Heritage.extend(ScratchpadTab.prototype, {
*/
_attach: function SW__attach()
{
let deferred = promise.defer();
if (!DebuggerServer.initialized) {
DebuggerServer.init();
DebuggerServer.addBrowserActors();
@ -2202,19 +2200,11 @@ ScratchpadWindow.prototype = Heritage.extend(ScratchpadTab.prototype, {
DebuggerServer.allowChromeProcess = true;
let client = new DebuggerClient(DebuggerServer.connectPipe());
client.connect(() => {
client.getProcess().then(aResponse => {
if (aResponse.error) {
reportError("listTabs", aResponse);
deferred.reject(aResponse);
}
else {
deferred.resolve({ form: aResponse.form, client: client });
}
return client.connect()
.then(() => client.getProcess())
.then(aResponse => {
return { form: aResponse.form, client: client };
});
});
return deferred.promise;
}
});

4
devtools/client/shared/test/test-actor-registry.js
View File

@ -78,9 +78,7 @@ exports.getTestActorWithoutToolbox = Task.async(function* (tab) {
}
let client = new DebuggerClient(DebuggerServer.connectPipe());
let deferred = promise.defer();
client.connect(deferred.resolve);
yield deferred.promise;
yield client.connect();
// We also need to make sure the test actor is registered on the server.
yield registerTestActor(client);

12
devtools/client/webconsole/hudservice.js
View File

@ -192,15 +192,13 @@ HUD_SERVICE.prototype =
DebuggerServer.allowChromeProcess = true;
let client = new DebuggerClient(DebuggerServer.connectPipe());
client.connect(() => {
client.getProcess().then(aResponse => {
return client.connect()
.then(() => client.getProcess())
.then(aResponse => {
// Set chrome:false in order to attach to the target
// (i.e. send an `attach` request to the chrome actor)
deferred.resolve({ form: aResponse.form, client: client, chrome: false });
}, deferred.reject);
});
return deferred.promise;
return { form: aResponse.form, client: client, chrome: false };
});
}
let target;

6
devtools/server/tests/browser/browser_register_actor.js
View File

@ -11,8 +11,9 @@ function test() {
}
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function onConnect() {
gClient.listTabs(function onListTabs(aResponse) {
gClient.connect()
.then(() => gClient.listTabs())
.then(aResponse => {
var options = {
prefix: "helloActor",
@ -41,7 +42,6 @@ function test() {
});
});
});
});
}
function checkActorState(helloActor, callback) {

10
devtools/server/tests/browser/head.js
View File

@ -81,13 +81,11 @@ function initDebuggerServer() {
* connected.
*/
function connectDebuggerClient(client) {
return new Promise(resolve => {
client.connect(() => {
client.listTabs(tabs => {
resolve(tabs.tabs[tabs.selected]);
});
return client.connect()
.then(() => client.listTabs())
.then(tabs => {
return tabs.tabs[tabs.selected];
});
});
}
/**

4
devtools/server/tests/mochitest/director-helpers.js
View File

@ -13,8 +13,6 @@ SimpleTest.registerCleanupFunction(function() {
Services.prefs.clearUserPref("dom.mozBrowserFramesEnabled");
});
const {promiseInvoke} = require("devtools/shared/async-utils");
const { DirectorRegistry,
DirectorRegistryFront } = require("devtools/server/actors/director-registry");
@ -30,7 +28,7 @@ function* newConnectedDebuggerClient(opts) {
var transport = DebuggerServer.connectPipe();
var client = new DebuggerClient(transport);
yield promiseInvoke(client, client.connect);
yield client.connect();
var root = yield client.listTabs();

2
devtools/server/tests/mochitest/inspector-helpers.js
View File

@ -58,7 +58,7 @@ function attachURL(url, callback) {
window.addEventListener("message", function loadListener(event) {
if (event.data === "ready") {
client = new DebuggerClient(DebuggerServer.connectPipe());
client.connect((applicationType, traits) => {
client.connect().then(([applicationType, traits]) => {
client.listTabs(response => {
for (let tab of response.tabs) {
if (tab.url === url) {

24
devtools/server/tests/mochitest/memory-helpers.js
View File

@ -22,26 +22,14 @@ function startServerAndGetSelectedTabMemory() {
DebuggerServer.addBrowserActors();
var client = new DebuggerClient(DebuggerServer.connectPipe());
return new Promise((resolve, reject) => {
client.connect(response => {
if (response.error) {
reject(new Error(response.error + ": " + response.message));
return;
}
return client.connect()
.then(() => client.listTabs())
.then(response => {
var form = response.tabs[response.selected];
var memory = MemoryFront(client, form, response);
client.listTabs(response => {
if (response.error) {
reject(new Error(response.error + ": " + response.message));
return;
}
var form = response.tabs[response.selected];
var memory = MemoryFront(client, form, response);
resolve({ memory, client });
});
return { memory, client };
});
});
}
function destroyServerAndFinish(client) {

24
devtools/server/tests/mochitest/memprof-helpers.js
View File

@ -23,26 +23,14 @@ function startServerAndGetSelectedTabMemprof() {
DebuggerServer.addBrowserActors();
var client = new DebuggerClient(DebuggerServer.connectPipe());
return new Promise((resolve, reject) => {
client.connect(response => {
if (response.error) {
reject(new Error(response.error + ": " + response.message));
return;
}
return client.connect()
.then(() => client.listTabs())
.then(response => {
var form = response.tabs[response.selected];
var memprof = MemprofFront(client, form);
client.listTabs(response => {
if (response.error) {
reject(new Error(response.error + ": " + response.message));
return;
}
var form = response.tabs[response.selected];
var memprof = MemprofFront(client, form);
resolve({ memprof, client });
});
return { memprof, client };
});
});
}
function destroyServerAndFinish(client) {

2
devtools/server/tests/mochitest/test_device.html
View File

@ -34,7 +34,7 @@ window.onload = function() {
}
var client = new DebuggerClient(DebuggerServer.connectPipe());
client.connect(function onConnect() {
client.connect().then(function onConnect() {
client.listTabs(function onListTabs(aResponse) {
var d = getDeviceFront(client, aResponse);

2
devtools/server/tests/mochitest/test_framerate_01.html
View File

@ -75,7 +75,7 @@ window.onload = function() {
}
var client = new DebuggerClient(DebuggerServer.connectPipe());
client.connect(function onConnect() {
client.connect().then(function onConnect() {
client.listTabs(function onListTabs(aResponse) {
var form = aResponse.tabs[aResponse.selected];
var front = FramerateFront(client, form);

2
devtools/server/tests/mochitest/test_framerate_02.html
View File

@ -75,7 +75,7 @@ window.onload = function() {
}
var client = new DebuggerClient(DebuggerServer.connectPipe());
client.connect(function onConnect() {
client.connect().then(function onConnect() {
client.listTabs(function onListTabs(aResponse) {
var form = aResponse.tabs[aResponse.selected];
var front = FramerateFront(client, form);

2
devtools/server/tests/mochitest/test_framerate_03.html
View File

@ -43,7 +43,7 @@ window.onload = function() {
}
var client = new DebuggerClient(DebuggerServer.connectPipe());
client.connect(function onConnect() {
client.connect().then(function onConnect() {
client.listTabs(function onListTabs(aResponse) {
var form = aResponse.tabs[aResponse.selected];
var front = FramerateFront(client, form);

2
devtools/server/tests/mochitest/test_framerate_05.html
View File

@ -38,7 +38,7 @@ window.onload = function() {
DebuggerServer.addBrowserActors();
var client = new DebuggerClient(DebuggerServer.connectPipe());
client.connect(function onConnect() {
client.connect().then(function onConnect() {
client.listTabs(function onListTabs(aResponse) {
var form = aResponse.tabs[aResponse.selected];
var front = FramerateFront(client, form);

2
devtools/server/tests/mochitest/test_getProcess.html
View File

@ -52,7 +52,7 @@ function runTests() {
// Fake a first connection to the content process
let transport = DebuggerServer.connectPipe();
client = new DebuggerClient(transport);
client.connect(listProcess);
client.connect().then(listProcess);
}
function listProcess() {

2
devtools/server/tests/mochitest/test_preference.html
View File

@ -31,7 +31,7 @@ function runTests() {
DebuggerServer.addBrowserActors();
var client = new DebuggerClient(DebuggerServer.connectPipe());
client.connect(function onConnect() {
client.connect().then(function onConnect() {
client.listTabs(function onListTabs(aResponse) {
var p = getPreferenceFront(client, aResponse);

2
devtools/server/tests/mochitest/test_settings.html
View File

@ -35,7 +35,7 @@ function runTests() {
DebuggerServer.addBrowserActors();
var client = new DebuggerClient(DebuggerServer.connectPipe());
client.connect(function onConnect() {
client.connect().then(function onConnect() {
client.listTabs(function onListTabs(aResponse) {
var s = getSettingsFront(client, aResponse);

12
devtools/server/tests/unit/head_dbg.js
View File

@ -130,11 +130,7 @@ function createTestGlobal(name) {
function connect(client) {
dump("Connecting client.\n");
return new Promise(function (resolve) {
client.connect(function () {
resolve();
});
});
return client.connect();
}
function close(client) {
@ -423,11 +419,11 @@ function get_chrome_actors(callback)
DebuggerServer.allowChromeProcess = true;
let client = new DebuggerClient(DebuggerServer.connectPipe());
client.connect(() => {
client.getProcess().then(response => {
client.connect()
.then(() => client.getProcess())
.then(response => {
callback(client, response.form);
});
});
}
function getChromeActors(client, server = DebuggerServer) {

2
devtools/server/tests/unit/test_actor-registry-actor.js
View File

@ -19,7 +19,7 @@ function run_test()
initTestDebuggerServer();
DebuggerServer.addBrowserActors();
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(getRegistry);
gClient.connect().then(getRegistry);
do_test_pending();
}

6
devtools/server/tests/unit/test_add_actors.js
View File

@ -35,12 +35,12 @@ function run_test()
function init()
{
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function onConnect() {
gClient.listTabs(function onListTabs(aResponse) {
gClient.connect()
.then(() => gClient.listTabs())
.then(aResponse => {
gActors = aResponse;
run_next_test();
});
});
}
function test_pre_init_global_actor()

2
devtools/server/tests/unit/test_attach.js
View File

@ -12,7 +12,7 @@ function run_test()
let transport = DebuggerServer.connectPipe();
gClient = new DebuggerClient(transport);
gClient.connect(function(aType, aTraits) {
gClient.connect().then(function([aType, aTraits]) {
attachTestTab(gClient, "test-1", function(aReply, aTabClient) {
test_attach(aTabClient);
});

2
devtools/server/tests/unit/test_blackboxing-01.js
View File

@ -14,7 +14,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-black-box");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-black-box", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
testBlackBox();

2
devtools/server/tests/unit/test_blackboxing-02.js
View File

@ -16,7 +16,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-black-box");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-black-box", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_black_box();

2
devtools/server/tests/unit/test_blackboxing-03.js
View File

@ -15,7 +15,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-black-box");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-black-box", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_black_box();

2
devtools/server/tests/unit/test_blackboxing-04.js
View File

@ -14,7 +14,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-black-box");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-black-box", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_black_box();

2
devtools/server/tests/unit/test_blackboxing-05.js
View File

@ -14,7 +14,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-black-box");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-black-box", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
// XXX: We have to do an executeSoon so that the error isn't caught and

2
devtools/server/tests/unit/test_blackboxing-06.js
View File

@ -16,7 +16,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-black-box");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-black-box", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;

2
devtools/server/tests/unit/test_blackboxing-07.js
View File

@ -15,7 +15,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-black-box");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-black-box", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
testBlackBox();

2
devtools/server/tests/unit/test_breakpoint-01.js
View File

@ -23,7 +23,7 @@ function run_test_with_server(aServer, aCallback)
initTestDebuggerServer(aServer);
gDebuggee = addTestGlobal("test-stack", aServer);
gClient = new DebuggerClient(aServer.connectPipe());
gClient.connect(function () {
gClient.connect().then(function () {
attachTestTabAndResume(gClient, "test-stack", function (aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_simple_breakpoint();

2
devtools/server/tests/unit/test_breakpoint-02.js
View File

@ -24,7 +24,7 @@ function run_test_with_server(aServer, aCallback)
initTestDebuggerServer(aServer);
gDebuggee = addTestGlobal("test-stack", aServer);
gClient = new DebuggerClient(aServer.connectPipe());
gClient.connect(function () {
gClient.connect().then(function () {
attachTestTabAndResume(gClient, "test-stack", function (aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_breakpoint_running();

2
devtools/server/tests/unit/test_breakpoint-03.js
View File

@ -26,7 +26,7 @@ function run_test_with_server(aServer, aCallback)
initTestDebuggerServer(aServer);
gDebuggee = addTestGlobal("test-stack", aServer);
gClient = new DebuggerClient(aServer.connectPipe());
gClient.connect(function () {
gClient.connect().then(function () {
attachTestTabAndResume(gClient,
"test-stack",
function (aResponse, aTabClient, aThreadClient) {

2
devtools/server/tests/unit/test_breakpoint-04.js
View File

@ -24,7 +24,7 @@ function run_test_with_server(aServer, aCallback)
initTestDebuggerServer(aServer);
gDebuggee = addTestGlobal("test-stack", aServer);
gClient = new DebuggerClient(aServer.connectPipe());
gClient.connect(function () {
gClient.connect().then(function () {
attachTestTabAndResume(gClient, "test-stack", function (aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_child_breakpoint();

2
devtools/server/tests/unit/test_breakpoint-05.js
View File

@ -25,7 +25,7 @@ function run_test_with_server(aServer, aCallback)
initTestDebuggerServer(aServer);
gDebuggee = addTestGlobal("test-stack", aServer);
gClient = new DebuggerClient(aServer.connectPipe());
gClient.connect(function () {
gClient.connect().then(function () {
attachTestTabAndResume(gClient, "test-stack", function (aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_child_skip_breakpoint();

2
devtools/server/tests/unit/test_breakpoint-06.js
View File

@ -25,7 +25,7 @@ function run_test_with_server(aServer, aCallback)
initTestDebuggerServer(aServer);
gDebuggee = addTestGlobal("test-stack", aServer);
gClient = new DebuggerClient(aServer.connectPipe());
gClient.connect(function () {
gClient.connect().then(function () {
attachTestTabAndResume(gClient, "test-stack", function (aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_nested_breakpoint();

2
devtools/server/tests/unit/test_breakpoint-07.js
View File

@ -25,7 +25,7 @@ function run_test_with_server(aServer, aCallback)
initTestDebuggerServer(aServer);
gDebuggee = addTestGlobal("test-stack", aServer);
gClient = new DebuggerClient(aServer.connectPipe());
gClient.connect(function () {
gClient.connect().then(function () {
attachTestTabAndResume(gClient, "test-stack", function (aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_second_child_skip_breakpoint();

2
devtools/server/tests/unit/test_breakpoint-08.js
View File

@ -25,7 +25,7 @@ function run_test_with_server(aServer, aCallback)
initTestDebuggerServer(aServer);
gDebuggee = addTestGlobal("test-stack", aServer);
gClient = new DebuggerClient(aServer.connectPipe());
gClient.connect(function () {
gClient.connect().then(function () {
attachTestTabAndResume(gClient, "test-stack", function (aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_child_skip_breakpoint();

2
devtools/server/tests/unit/test_breakpoint-09.js
View File

@ -24,7 +24,7 @@ function run_test_with_server(aServer, aCallback)
initTestDebuggerServer(aServer);
gDebuggee = addTestGlobal("test-stack", aServer);
gClient = new DebuggerClient(aServer.connectPipe());
gClient.connect(function () {
gClient.connect().then(function () {
attachTestTabAndResume(gClient, "test-stack", function (aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_remove_breakpoint();

2
devtools/server/tests/unit/test_breakpoint-10.js
View File

@ -25,7 +25,7 @@ function run_test_with_server(aServer, aCallback)
initTestDebuggerServer(aServer);
gDebuggee = addTestGlobal("test-stack", aServer);
gClient = new DebuggerClient(aServer.connectPipe());
gClient.connect(function () {
gClient.connect().then(function () {
attachTestTabAndResume(gClient, "test-stack", function (aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_child_breakpoint();

2
devtools/server/tests/unit/test_breakpoint-11.js
View File

@ -25,7 +25,7 @@ function run_test_with_server(aServer, aCallback)
initTestDebuggerServer(aServer);
gDebuggee = addTestGlobal("test-stack", aServer);
gClient = new DebuggerClient(aServer.connectPipe());
gClient.connect(function () {
gClient.connect().then(function () {
attachTestTabAndResume(gClient, "test-stack", function (aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_child_breakpoint();

2
devtools/server/tests/unit/test_breakpoint-12.js
View File

@ -29,7 +29,7 @@ function run_test_with_server(aServer, aCallback)
initTestDebuggerServer(aServer);
gDebuggee = addTestGlobal("test-stack", aServer);
gClient = new DebuggerClient(aServer.connectPipe());
gClient.connect(function () {
gClient.connect().then(function () {
attachTestTabAndResume(gClient, "test-stack", function (aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_child_skip_breakpoint();

2
devtools/server/tests/unit/test_breakpoint-13.js
View File

@ -25,7 +25,7 @@ function run_test_with_server(aServer, aCallback)
initTestDebuggerServer(aServer);
gDebuggee = addTestGlobal("test-stack", aServer);
gClient = new DebuggerClient(aServer.connectPipe());
gClient.connect(function () {
gClient.connect().then(function () {
attachTestTabAndResume(gClient, "test-stack", function (aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_simple_breakpoint();

2
devtools/server/tests/unit/test_breakpoint-14.js
View File

@ -25,7 +25,7 @@ function run_test_with_server(aServer, aCallback)
initTestDebuggerServer(aServer);
gDebuggee = addTestGlobal("test-stack", aServer);
gClient = new DebuggerClient(aServer.connectPipe());
gClient.connect(function () {
gClient.connect().then(function () {
attachTestTabAndResume(gClient, "test-stack", function (aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_simple_breakpoint();

2
devtools/server/tests/unit/test_breakpoint-15.js
View File

@ -14,7 +14,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-stack");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function () {
gClient.connect().then(function () {
attachTestTabAndResume(gClient, "test-stack", function (aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
testSameBreakpoint();

2
devtools/server/tests/unit/test_breakpoint-16.js
View File

@ -24,7 +24,7 @@ function run_test_with_server(aServer, aCallback)
initTestDebuggerServer(aServer);
gDebuggee = addTestGlobal("test-breakpoints", aServer);
gClient = new DebuggerClient(aServer.connectPipe());
gClient.connect(function () {
gClient.connect().then(function () {
attachTestTabAndResume(gClient,
"test-breakpoints",
function (aResponse, aTabClient, aThreadClient) {

2
devtools/server/tests/unit/test_breakpoint-17.js
View File

@ -23,7 +23,7 @@ function run_test_with_server(aServer, aCallback)
initTestDebuggerServer(aServer);
gDebuggee = addTestGlobal("test-breakpoints", aServer);
gClient = new DebuggerClient(aServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-breakpoints", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_breakpoints_columns();

2
devtools/server/tests/unit/test_breakpoint-18.js
View File

@ -26,7 +26,7 @@ function run_test_with_server(aServer, aCallback)
gDebuggee = addTestGlobal("test-breakpoints", aServer);
gDebuggee.console = { log: x => void x };
gClient = new DebuggerClient(aServer.connectPipe());
gClient.connect(function () {
gClient.connect().then(function () {
attachTestTabAndResume(gClient,
"test-breakpoints",
function (aResponse, aTabClient, aThreadClient) {

2
devtools/server/tests/unit/test_breakpoint-19.js
View File

@ -26,7 +26,7 @@ function run_test_with_server(aServer, aCallback)
gDebuggee = addTestGlobal("test-breakpoints", aServer);
gDebuggee.console = { log: x => void x };
gClient = new DebuggerClient(aServer.connectPipe());
gClient.connect(function () {
gClient.connect().then(function () {
attachTestTabAndResume(gClient,
"test-breakpoints",
function (aResponse, aTabClient, aThreadClient) {

2
devtools/server/tests/unit/test_breakpoint-20.js
View File

@ -16,7 +16,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-breakpoints");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestThread(gClient, "test-breakpoints", testBreakpoint);
});
do_test_pending();

2
devtools/server/tests/unit/test_breakpoint-21.js
View File

@ -26,7 +26,7 @@ function run_test_with_server(aServer, aCallback)
initTestDebuggerServer(aServer);
gDebuggee = addTestGlobal("test-breakpoints", aServer);
gClient = new DebuggerClient(aServer.connectPipe());
gClient.connect(function () {
gClient.connect().then(function () {
attachTestTabAndResume(gClient,
"test-breakpoints",
function (aResponse, aTabClient, aThreadClient) {

2
devtools/server/tests/unit/test_client_close.js
View File

@ -12,7 +12,7 @@ function run_test()
let transport = DebuggerServer.connectPipe();
gClient = new DebuggerClient(transport);
gClient.connect(function(aType, aTraits) {
gClient.connect().then(function(aType, aTraits) {
attachTestTab(gClient, "test-1", function(aReply, aTabClient) {
test_close(transport);
});

6
devtools/server/tests/unit/test_client_request.js
View File

@ -45,12 +45,12 @@ function run_test()
function init()
{
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function onConnect() {
gClient.listTabs(function onListTabs(aResponse) {
gClient.connect()
.then(() => gClient.listTabs())
.then(aResponse => {
gActorId = aResponse.test;
run_next_test();
});
});
}
function checkStack(expectedName) {

2
devtools/server/tests/unit/test_conditional_breakpoint-01.js
View File

@ -14,7 +14,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-conditional-breakpoint");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function () {
gClient.connect().then(function () {
attachTestTabAndResume(gClient, "test-conditional-breakpoint", function (aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_simple_breakpoint();

2
devtools/server/tests/unit/test_conditional_breakpoint-02.js
View File

@ -14,7 +14,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-conditional-breakpoint");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function () {
gClient.connect().then(function () {
attachTestTabAndResume(gClient, "test-conditional-breakpoint", function (aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_simple_breakpoint();

2
devtools/server/tests/unit/test_conditional_breakpoint-03.js
View File

@ -14,7 +14,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-conditional-breakpoint");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function () {
gClient.connect().then(function () {
attachTestTabAndResume(gClient, "test-conditional-breakpoint", function (aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_simple_breakpoint();

2
devtools/server/tests/unit/test_dbgclient_debuggerstatement.js
View File

@ -13,7 +13,7 @@ function run_test()
let transport = DebuggerServer.connectPipe();
gClient = new DebuggerClient(transport);
gClient.connect(function(aType, aTraits) {
gClient.connect().then(function([aType, aTraits]) {
attachTestTab(gClient, "test-1", function(aReply, aTabClient) {
gTabClient = aTabClient;
test_threadAttach(aReply.threadActor);

2
devtools/server/tests/unit/test_eval-01.js
View File

@ -14,7 +14,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-stack");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-stack", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_simple_eval();

2
devtools/server/tests/unit/test_eval-02.js
View File

@ -14,7 +14,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-stack");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-stack", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_throw_eval();

2
devtools/server/tests/unit/test_eval-03.js
View File

@ -14,7 +14,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-stack");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then().then(function() {
attachTestTabAndResume(gClient, "test-stack", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_syntax_error_eval();

2
devtools/server/tests/unit/test_eval-04.js
View File

@ -14,7 +14,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-stack");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-stack", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_syntax_error_eval();

2
devtools/server/tests/unit/test_eval-05.js
View File

@ -14,7 +14,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-stack");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-stack", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_syntax_error_eval();

2
devtools/server/tests/unit/test_eventlooplag_actor.js
View File

@ -23,7 +23,7 @@ function run_test()
let client = new DebuggerClient(DebuggerServer.connectPipe());
// Start tracking event loop lags.
client.connect(function () {
client.connect().then(function () {
client.listTabs(function(resp) {
front = new EventLoopLagFront(client, resp);
front.start().then(success => {

2
devtools/server/tests/unit/test_forwardingprefix.js
View File

@ -52,7 +52,7 @@ function createMainConnection()
{
({ conn: gMainConnection, transport: gMainTransport } = newConnection());
gClient = new DebuggerClient(gMainTransport);
gClient.connect((aType, aTraits) => run_next_test());
gClient.connect().then(([aType, aTraits]) => run_next_test());
}
/*

2
devtools/server/tests/unit/test_frameactor-01.js
View File

@ -14,7 +14,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-stack");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-stack", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_pause_frame();

2
devtools/server/tests/unit/test_frameactor-02.js
View File

@ -14,7 +14,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-stack");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-stack", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_pause_frame();

2
devtools/server/tests/unit/test_frameactor-03.js
View File

@ -14,7 +14,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-stack");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-stack", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_pause_frame();

2
devtools/server/tests/unit/test_frameactor-04.js
View File

@ -14,7 +14,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-stack");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-stack", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_pause_frame();

2
devtools/server/tests/unit/test_frameactor-05.js
View File

@ -15,7 +15,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-stack");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-stack", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_pause_frame();

2
devtools/server/tests/unit/test_framearguments-01.js
View File

@ -14,7 +14,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-stack");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-stack", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_pause_frame();

2
devtools/server/tests/unit/test_framebindings-01.js
View File

@ -14,7 +14,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-stack");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-stack", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_pause_frame();

2
devtools/server/tests/unit/test_framebindings-02.js
View File

@ -14,7 +14,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-stack");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-stack", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_pause_frame();

2
devtools/server/tests/unit/test_framebindings-03.js
View File

@ -14,7 +14,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-stack");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-stack", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_pause_frame();

2
devtools/server/tests/unit/test_framebindings-04.js
View File

@ -14,7 +14,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-stack");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-stack", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_pause_frame();

2
devtools/server/tests/unit/test_framebindings-05.js
View File

@ -14,7 +14,7 @@ function run_test()
initTestDebuggerServer();
gDebuggee = addTestGlobal("test-stack");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-stack", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_pause_frame();

2
devtools/server/tests/unit/test_framebindings-06.js
View File

@ -11,7 +11,7 @@ function run_test()
gDebuggee = addTestGlobal("test-grips");
gClient = new DebuggerClient(DebuggerServer.connectPipe());
gClient.connect(function() {
gClient.connect().then(function() {
attachTestTabAndResume(gClient, "test-grips", function(aResponse, aTabClient, aThreadClient) {
gThreadClient = aThreadClient;
test_banana_environment();

Some files were not shown because too many files have changed in this diff Show More