Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 21:00:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1272774 - migrate all listTabs() callers to use promise;r=ochameau

Browse Source 
MozReview-Commit-ID: 9PtRZHG5GuF

--HG--
extra : rebase_source : f4c7cfd5f8338eb22fa44dc79a1e8b7840dc4e2d
This commit is contained in:
Julian Descottes 2018-01-15 18:38:34 +01:00
parent 8f3d4cf4b2
commit f714f056d0
25 changed files with 32 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ function test() {
is(aType, "browser",
"Root actor should identify itself as a browser.");
gClient.listTabs(aResponse => {
gClient.listTabs().then(aResponse => {
let globalActor = aResponse.testGlobalActor1;
ok(globalActor, "Found the test tab actor.");
ok(globalActor.includes("test_one"),

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

@ -45,7 +45,7 @@ function testFirstTab(aTab) {
gNewTab = aTab;
ok(!!gNewTab, "Second tab created.");
gClient.listTabs(aResponse => {
gClient.listTabs().then(aResponse => {
let tabActor = aResponse.tabs.filter(aGrip => aGrip.url == TAB1_URL).pop();
ok(tabActor,
"Should find a tab actor for the first tab.");
@ -75,7 +75,7 @@ function testNewWindow(aWindow) {
let isLoaded = promise.defer();
promise.all([isActive.promise, isLoaded.promise]).then(() => {
gClient.listTabs(aResponse => {
gClient.listTabs().then(aResponse => {
is(aResponse.selected, 2,
"The second tab is selected.");
@ -115,7 +115,7 @@ function testFocusFirst() {
let deferred = promise.defer();
once(window.content, "focus").then(() => {
gClient.listTabs(aResponse => {
gClient.listTabs().then(aResponse => {
is(aResponse.selected, 1,
"The first tab is selected after focusing on it.");
@ -142,7 +142,7 @@ function continue_remove_tab(deferred)
{
removeTab(gNewTab);
gClient.listTabs(aResponse => {
gClient.listTabs().then(aResponse => {
// Verify that tabs are no longer included in listTabs.
let foundTab1 = aResponse.tabs.some(aGrip => aGrip.url == TAB1_URL);
let foundTab2 = aResponse.tabs.some(aGrip => aGrip.url == TAB2_URL);

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

@ -161,7 +161,7 @@ function removeAddon(aAddon) {
function getTabActorForUrl(aClient, aUrl) {
let deferred = promise.defer();
aClient.listTabs(aResponse => {
aClient.listTabs().then(aResponse => {
let tabActor = aResponse.tabs.filter(aGrip => aGrip.url == aUrl).pop();
deferred.resolve(tabActor);
});

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

@ -75,7 +75,7 @@ function getClient() {
function getTarget(client) {
let deferred = defer();
client.listTabs(tabList => {
client.listTabs().then(tabList => {
let target = TargetFactory.forRemoteTab({
client: client,
form: tabList.tabs[tabList.selected],

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

@ -9,7 +9,6 @@
const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
const { fetch } = require("devtools/shared/DevToolsUtils");
const defer = require("devtools/shared/defer");
const { Task } = require("devtools/shared/task");
const TEST_URL_ROOT = "http://example.com/browser/devtools/client/shared/test/";
@ -18,9 +17,7 @@
// Register a test actor that can operate on the remote document
exports.registerTestActor = Task.async(function* (client) {
// First, instanciate ActorRegistryFront to be able to dynamically register an actor
let deferred = defer();
client.listTabs(deferred.resolve);
let response = yield deferred.promise;
let response = yield client.listTabs();
let { ActorRegistryFront } = require("devtools/shared/fronts/actor-registry");
let registryFront = ActorRegistryFront(client, response);

2
devtools/client/webide/modules/app-manager.js
View File

@ -167,7 +167,7 @@ var AppManager = exports.AppManager = {
}
this._listTabsResponse = null;
} else {
this.connection.client.listTabs((response) => {
this.connection.client.listTabs().then((response) => {
if (response.webappsActor) {
let front = new AppActorFront(this.connection.client,
response);

2
devtools/client/webide/modules/tab-store.js
View File

@ -98,7 +98,7 @@ TabStore.prototype = {
}
return new Promise((resolve, reject) => {
this._connection.client.listTabs(response => {
this._connection.client.listTabs().then(response => {
if (response.error) {
this._connection.disconnect();
reject(response.error);

4
devtools/docs/backend/client-api.md
View File

@ -80,7 +80,7 @@ Attaching to a browser tab requires enumerating the available tabs and attaching
```javascript
function attachToTab() {
// Get the list of tabs to find the one to attach to.
client.listTabs((response) => {
client.listTabs().then((response) => {
// Find the active tab.
let tab = response.tabs[response.selected];
@ -191,7 +191,7 @@ function shutdownDebugger() {
*/
function debugTab() {
// Get the list of tabs to find the one to attach to.
client.listTabs(response => {
client.listTabs().then(response => {
// Find the active tab.
let tab = response.tabs[response.selected];
// Attach to the tab.

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

@ -22,7 +22,7 @@ function test() {
let registry = ActorRegistryFront(gClient, response);
registry.registerActor(actorURL, options).then(actorFront => {
gClient.listTabs(res => {
gClient.listTabs().then(res => {
let tab = res.tabs[res.selected];
ok(!!tab.helloActor, "Hello actor must exist");

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

@ -121,11 +121,7 @@ async function initPerfFront() {
* @return {RootActor} Resolves when connected.
*/
function getRootForm(client) {
return new Promise(resolve => {
client.listTabs(rootForm => {
resolve(rootForm);
});
});
return client.listTabs();
}
/**

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

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

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

@ -32,7 +32,7 @@ window.onload = function () {
let client = new DebuggerClient(DebuggerServer.connectPipe());
client.connect().then(function onConnect() {
client.listTabs(function onListTabs(response) {
client.listTabs().then(function onListTabs(response) {
let d = getDeviceFront(client, response);
let desc;

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

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

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

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

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

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

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

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

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

@ -32,7 +32,7 @@ function runTests() {
let client = new DebuggerClient(DebuggerServer.connectPipe());
client.connect().then(function onConnect() {
client.listTabs(function onListTabs(response) {
client.listTabs().then(function onListTabs(response) {
let p = getPreferenceFront(client, response);
let prefs = {};

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

@ -353,7 +353,7 @@ function addTestGlobal(name, server = DebuggerServer) {
// List the DebuggerClient |client|'s tabs, look for one whose title is
// |title|, and apply |callback| to the packet's entry for that tab.
function getTestTab(client, title, callback) {
client.listTabs(function (response) {
client.listTabs().then(function (response) {
for (let tab of response.tabs) {
if (tab.title === title) {
callback(tab, response);

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

@ -25,7 +25,7 @@ function run_test() {
}
function getRegistry() {
gClient.listTabs((response) => {
gClient.listTabs().then((response) => {
gRegistryFront = ActorRegistryFront(gClient, response);
registerNewActor();
});
@ -49,7 +49,7 @@ function registerNewActor() {
}
function talkToNewActor() {
gClient.listTabs(({ helloActor }) => {
gClient.listTabs().then(({ helloActor }) => {
Assert.ok(!!helloActor);
gClient.request({
to: helloActor,
@ -72,7 +72,7 @@ function unregisterNewActor() {
}
function testActorIsUnregistered() {
gClient.listTabs(({ helloActor }) => {
gClient.listTabs().then(({ helloActor }) => {
Assert.ok(!helloActor);
Services.prefs.setBoolPref("devtools.debugger.forbid-certified-apps", gOldPref);

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

@ -90,7 +90,7 @@ function test_stable_global_actor_instances() {
let connID = Object.keys(DebuggerServer._connections)[0];
let postInitGlobalActor = getActorInstance(connID, gActors.postInitGlobalActor);
let preInitGlobalActor = getActorInstance(connID, gActors.preInitGlobalActor);
gClient.listTabs(function onListTabs(response) {
gClient.listTabs().then(function onListTabs(response) {
Assert.equal(postInitGlobalActor,
getActorInstance(connID, response.postInitGlobalActor));
Assert.equal(preInitGlobalActor,

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

@ -16,7 +16,7 @@ function run_test() {
let transport = DebuggerServer.connectPipe();
gClient = new DebuggerClient(transport);
gClient.addListener("connected", function (event, type, traits) {
gClient.listTabs((response) => {
gClient.listTabs().then((response) => {
Assert.ok("tabs" in response);
for (let tab of response.tabs) {
if (tab.title == "test-1") {

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

@ -22,7 +22,7 @@ function run_test() {
// Start tracking event loop lags.
client.connect().then(function () {
client.listTabs(function (resp) {
client.listTabs().then(function (resp) {
front = new EventLoopLagFront(client, resp);
front.start().then(success => {
Assert.ok(success);

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

@ -73,7 +73,7 @@ function test_lazy_api() {
let client = new DebuggerClient(DebuggerServer.connectPipe());
client.connect().then(function onConnect() {
client.listTabs(onListTabs);
client.listTabs().then(onListTabs);
});
function onListTabs(response) {
// On listTabs, the actor is still not loaded,

6
devtools/shared/security/tests/unit/test_encryption.js
View File

@ -13,11 +13,7 @@ function run_test() {
}
function connectClient(client) {
let deferred = defer();
client.connect(() => {
client.listTabs(deferred.resolve);
});
return deferred.promise;
return client.connect(() => client.listTabs());
}
add_task(function* () {

4
devtools/shared/transport/tests/unit/test_client_server_bulk.js
View File

@ -147,7 +147,7 @@ var test_bulk_request_cs = Task.async(function* (transportFactory, actorType, re
let client = new DebuggerClient(transport);
client.connect().then(([app, traits]) => {
Assert.equal(traits.bulk, true);
client.listTabs(clientDeferred.resolve);
client.listTabs().then(clientDeferred.resolve);
});
function bulkSendReadyCallback({copyFrom}) {
@ -205,7 +205,7 @@ var test_json_request_cs = Task.async(function* (transportFactory, actorType, re
let client = new DebuggerClient(transport);
client.connect((app, traits) => {
Assert.equal(traits.bulk, true);
client.listTabs(clientDeferred.resolve);
client.listTabs().then(clientDeferred.resolve);
});
clientDeferred.promise.then(response => {