From f98d0997fe504f176cce8a4713d93dc49dcdef95 Mon Sep 17 00:00:00 2001 From: Alexandre Poirot Date: Tue, 18 Sep 2018 02:18:23 -0700 Subject: [PATCH] Bug 1485676 - Rename DebuggerClient.attachTab to attachTarget. r=jdescottes Summary: This method isn't specific to tabs. It can attach to any "target" actor that inherits from BrowsingContextActor. Depends On D6161 Reviewers: yulia! Tags: #secure-revision Bug #: 1485676 Differential Revision: https://phabricator.services.mozilla.com/D6162 MozReview-Commit-ID: Exz5fWyWyfN --- .../mochitest/browser_dbg-chrome-debugging.js | 2 +- .../browser_dbg_WorkerTargetActor.attach.js | 2 +- ...wser_dbg_WorkerTargetActor.attachThread.js | 4 ++-- .../mochitest/browser_dbg_chrome-debugging.js | 2 +- .../test/mochitest/browser_dbg_listworkers.js | 2 +- .../browser_dbg_promises-allocation-stack.js | 2 +- ...er_dbg_promises-chrome-allocation-stack.js | 2 +- .../browser_dbg_promises-fulfillment-stack.js | 2 +- .../browser_dbg_promises-rejection-stack.js | 2 +- .../mochitest/browser_dbg_worker-window.js | 2 +- .../client/debugger/test/mochitest/head.js | 8 +++---- devtools/client/framework/target.js | 2 +- devtools/client/framework/toolbox-options.js | 2 +- devtools/docs/backend/client-api.md | 6 ++--- .../tests/browser/browser_navigateEvents.js | 2 +- .../browser_stylesheets_getTextEmpty.js | 2 +- .../browser_stylesheets_nested-iframes.js | 2 +- .../browser_webextension_inspected_window.js | 2 +- .../tests/mochitest/inspector-helpers.js | 2 +- .../tests/mochitest/webconsole-helpers.js | 2 +- devtools/server/tests/unit/head_dbg.js | 6 ++--- .../tests/unit/test_promises_actor_attach.js | 4 ++-- .../unit/test_promises_actor_list_promises.js | 2 +- .../unit/test_promises_actor_onnewpromise.js | 2 +- .../test_promises_actor_onpromisesettled.js | 2 +- ...st_promises_client_getdependentpromises.js | 4 ++-- .../test_promises_object_creationtimestamp.js | 2 +- .../test_promises_object_timetosettle-01.js | 2 +- .../test_promises_object_timetosettle-02.js | 6 ++--- ...etBreakpoint-at-the-beginning-of-a-line.js | 2 +- ...test_setBreakpoint-at-the-end-of-a-line.js | 2 +- ...t_setBreakpoint-on-column-in-gcd-script.js | 2 +- .../unit/test_setBreakpoint-on-column.js | 2 +- ...est_setBreakpoint-on-line-in-gcd-script.js | 2 +- ...reakpoint-on-line-with-multiple-offsets.js | 2 +- ...kpoint-on-line-with-multiple-statements.js | 2 +- ...t-on-line-with-no-offsets-in-gcd-script.js | 2 +- ...t_setBreakpoint-on-line-with-no-offsets.js | 2 +- .../tests/unit/test_setBreakpoint-on-line.js | 2 +- .../tests/unit/test_xpcshell_debugging.js | 2 +- devtools/shared/client/debugger-client.js | 23 +++++++++++-------- devtools/shared/webconsole/test/common.js | 4 ++-- 42 files changed, 67 insertions(+), 64 deletions(-) diff --git a/devtools/client/debugger/new/test/mochitest/browser_dbg-chrome-debugging.js b/devtools/client/debugger/new/test/mochitest/browser_dbg-chrome-debugging.js index 52b8c1ca62a1..d354a80213bf 100644 --- a/devtools/client/debugger/new/test/mochitest/browser_dbg-chrome-debugging.js +++ b/devtools/client/debugger/new/test/mochitest/browser_dbg-chrome-debugging.js @@ -30,7 +30,7 @@ function initDebuggerClient() { } async function attachThread(client, actor) { - let [response, tabClient] = await client.attachTab(actor); + let [response, tabClient] = await client.attachTarget(actor); let [response2, threadClient] = await tabClient.attachThread(null); return threadClient; } diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_WorkerTargetActor.attach.js b/devtools/client/debugger/test/mochitest/browser_dbg_WorkerTargetActor.attach.js index d3b1520e0a26..e09ec741beab 100644 --- a/devtools/client/debugger/test/mochitest/browser_dbg_WorkerTargetActor.attach.js +++ b/devtools/client/debugger/test/mochitest/browser_dbg_WorkerTargetActor.attach.js @@ -18,7 +18,7 @@ function test() { let tab = yield addTab(TAB1_URL); let { tabs } = yield listTabs(client); - let [, tabClient] = yield attachTab(client, findTab(tabs, TAB1_URL)); + let [, tabClient] = yield attachTarget(client, findTab(tabs, TAB1_URL)); yield listWorkers(tabClient); // If a page still has pending network requests, it will not be moved into diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_WorkerTargetActor.attachThread.js b/devtools/client/debugger/test/mochitest/browser_dbg_WorkerTargetActor.attachThread.js index 4e5636b43613..044ad8957f44 100644 --- a/devtools/client/debugger/test/mochitest/browser_dbg_WorkerTargetActor.attachThread.js +++ b/devtools/client/debugger/test/mochitest/browser_dbg_WorkerTargetActor.attachThread.js @@ -13,9 +13,9 @@ function test() { let tab = yield addTab(TAB_URL); let { tabs: tabs1 } = yield listTabs(client1); - let [, tabClient1] = yield attachTab(client1, findTab(tabs1, TAB_URL)); + let [, tabClient1] = yield attachTarget(client1, findTab(tabs1, TAB_URL)); let { tabs: tabs2 } = yield listTabs(client2); - let [, tabClient2] = yield attachTab(client2, findTab(tabs2, TAB_URL)); + let [, tabClient2] = yield attachTarget(client2, findTab(tabs2, TAB_URL)); yield listWorkers(tabClient1); yield listWorkers(tabClient2); diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_chrome-debugging.js b/devtools/client/debugger/test/mochitest/browser_dbg_chrome-debugging.js index 7ed9fe1daf55..e0fca8c004df 100644 --- a/devtools/client/debugger/test/mochitest/browser_dbg_chrome-debugging.js +++ b/devtools/client/debugger/test/mochitest/browser_dbg_chrome-debugging.js @@ -46,7 +46,7 @@ function testParentProcessTargetActor() { gClient.addListener("newGlobal", onNewGlobal); let actor = aResponse.form.actor; - gClient.attachTab(actor).then(([response, tabClient]) => { + gClient.attachTarget(actor).then(([response, tabClient]) => { tabClient.attachThread(null).then(([aResponse, aThreadClient]) => { gThreadClient = aThreadClient; gThreadClient.addListener("newSource", onNewSource); diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_listworkers.js b/devtools/client/debugger/test/mochitest/browser_dbg_listworkers.js index 90498549b1fe..d0f7d7121edd 100644 --- a/devtools/client/debugger/test/mochitest/browser_dbg_listworkers.js +++ b/devtools/client/debugger/test/mochitest/browser_dbg_listworkers.js @@ -12,7 +12,7 @@ function test() { let tab = yield addTab(TAB_URL); let { tabs } = yield listTabs(client); - let [, tabClient] = yield attachTab(client, findTab(tabs, TAB_URL)); + let [, tabClient] = yield attachTarget(client, findTab(tabs, TAB_URL)); let { workers } = yield listWorkers(tabClient); is(workers.length, 0); diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_promises-allocation-stack.js b/devtools/client/debugger/test/mochitest/browser_dbg_promises-allocation-stack.js index 124028bc21dc..a326950fe7c5 100644 --- a/devtools/client/debugger/test/mochitest/browser_dbg_promises-allocation-stack.js +++ b/devtools/client/debugger/test/mochitest/browser_dbg_promises-allocation-stack.js @@ -29,7 +29,7 @@ function test() { let { tabs } = yield listTabs(client); let targetTab = findTab(tabs, TAB_URL); - yield attachTab(client, targetTab); + yield attachTarget(client, targetTab); yield testGetAllocationStack(client, targetTab, tab); diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_promises-chrome-allocation-stack.js b/devtools/client/debugger/test/mochitest/browser_dbg_promises-chrome-allocation-stack.js index abe9ff4078bb..c3795e094de3 100644 --- a/devtools/client/debugger/test/mochitest/browser_dbg_promises-chrome-allocation-stack.js +++ b/devtools/client/debugger/test/mochitest/browser_dbg_promises-chrome-allocation-stack.js @@ -30,7 +30,7 @@ function test() { let client = new DebuggerClient(DebuggerServer.connectPipe()); yield connect(client); let chrome = yield client.getProcess(); - let [, tabClient] = yield attachTab(client, chrome.form); + let [, tabClient] = yield attachTarget(client, chrome.form); yield tabClient.attachThread(); yield testGetAllocationStack(client, chrome.form, () => { diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_promises-fulfillment-stack.js b/devtools/client/debugger/test/mochitest/browser_dbg_promises-fulfillment-stack.js index 2a6f4df8174c..c141291fc205 100644 --- a/devtools/client/debugger/test/mochitest/browser_dbg_promises-fulfillment-stack.js +++ b/devtools/client/debugger/test/mochitest/browser_dbg_promises-fulfillment-stack.js @@ -47,7 +47,7 @@ function test() { let { tabs } = yield listTabs(client); let targetTab = findTab(tabs, TAB_URL); - yield attachTab(client, targetTab); + yield attachTarget(client, targetTab); yield testGetFulfillmentStack(client, targetTab, tab); diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_promises-rejection-stack.js b/devtools/client/debugger/test/mochitest/browser_dbg_promises-rejection-stack.js index c80fbeb2c686..a24e0201efc1 100644 --- a/devtools/client/debugger/test/mochitest/browser_dbg_promises-rejection-stack.js +++ b/devtools/client/debugger/test/mochitest/browser_dbg_promises-rejection-stack.js @@ -54,7 +54,7 @@ function test() { let { tabs } = yield listTabs(client); let targetTab = findTab(tabs, TAB_URL); - yield attachTab(client, targetTab); + yield attachTarget(client, targetTab); yield testGetRejectionStack(client, targetTab, tab); diff --git a/devtools/client/debugger/test/mochitest/browser_dbg_worker-window.js b/devtools/client/debugger/test/mochitest/browser_dbg_worker-window.js index 1301c9f8c5f5..cb49be10728e 100644 --- a/devtools/client/debugger/test/mochitest/browser_dbg_worker-window.js +++ b/devtools/client/debugger/test/mochitest/browser_dbg_worker-window.js @@ -22,7 +22,7 @@ add_task(async function() { let tab = await addTab(TAB_URL); let { tabs } = await listTabs(client); - let [, tabClient] = await attachTab(client, findTab(tabs, TAB_URL)); + let [, tabClient] = await attachTarget(client, findTab(tabs, TAB_URL)); await listWorkers(tabClient); await createWorkerInTab(tab, WORKER_URL); diff --git a/devtools/client/debugger/test/mochitest/head.js b/devtools/client/debugger/test/mochitest/head.js index 7a32887a0121..b1df339ea3a9 100644 --- a/devtools/client/debugger/test/mochitest/head.js +++ b/devtools/client/debugger/test/mochitest/head.js @@ -179,7 +179,7 @@ function getAddonActorForId(aClient, aAddonId) { async function attachTargetActorForUrl(aClient, aUrl) { let grip = await getTargetActorForUrl(aClient, aUrl); - let [ response ] = await aClient.attachTab(grip.actor); + let [ response ] = await aClient.attachTarget(grip.actor); return [grip, response]; } @@ -1085,9 +1085,9 @@ function findTab(tabs, url) { return null; } -function attachTab(client, tab) { +function attachTarget(client, tab) { info("Attaching to tab with url '" + tab.url + "'."); - return client.attachTab(tab.actor); + return client.attachTarget(tab.actor); } function listWorkers(tabClient) { @@ -1297,7 +1297,7 @@ async function initWorkerDebugger(TAB_URL, WORKER_URL) { let tab = await addTab(TAB_URL); let { tabs } = await listTabs(client); - let [, tabClient] = await attachTab(client, findTab(tabs, TAB_URL)); + let [, tabClient] = await attachTarget(client, findTab(tabs, TAB_URL)); await createWorkerInTab(tab, WORKER_URL); diff --git a/devtools/client/framework/target.js b/devtools/client/framework/target.js index a6fce1f4816b..64877ad28437 100644 --- a/devtools/client/framework/target.js +++ b/devtools/client/framework/target.js @@ -476,7 +476,7 @@ TabTarget.prototype = { // Attach the target actor const attachTarget = async () => { - const [response, tabClient] = await this._client.attachTab(this._form.actor); + const [response, tabClient] = await this._client.attachTarget(this._form.actor); this.activeTab = tabClient; this.threadActor = response.threadActor; }; diff --git a/devtools/client/framework/toolbox-options.js b/devtools/client/framework/toolbox-options.js index 35dceaef4cc3..486e698fe21d 100644 --- a/devtools/client/framework/toolbox-options.js +++ b/devtools/client/framework/toolbox-options.js @@ -452,7 +452,7 @@ OptionsPanel.prototype = { } if (this.target.activeTab && !this.target.chrome) { - const [ response ] = await this.target.client.attachTab(this.target.activeTab._actor); + const [ response ] = await this.target.client.attachTarget(this.target.activeTab._actor); this._origJavascriptEnabled = !response.javascriptEnabled; this.disableJSNode.checked = this._origJavascriptEnabled; this.disableJSNode.addEventListener("click", this._disableJSClicked); diff --git a/devtools/docs/backend/client-api.md b/devtools/docs/backend/client-api.md index c482f0a5a82e..a0a4064f63a5 100644 --- a/devtools/docs/backend/client-api.md +++ b/devtools/docs/backend/client-api.md @@ -85,7 +85,7 @@ function attachToTab() { let tab = response.tabs[response.selected]; // Attach to the tab. - client.attachTab(tab.actor).then(([response, tabClient]) => { + client.attachTarget(tab.actor).then(([response, tabClient]) => { if (!tabClient) { return; } @@ -121,7 +121,7 @@ Once the application is attached to a tab, it can attach to its thread in order ```javascript // Assuming the application is already attached to the tab, and response is the first -// argument of the attachTab callback. +// argument of the attachTarget callback. client.attachThread(response.threadActor).then(function([response, threadClient]) { if (!threadClient) { @@ -195,7 +195,7 @@ function debugTab() { // Find the active tab. let tab = response.tabs[response.selected]; // Attach to the tab. - client.attachTab(tab.actor).then(([response, tabClient]) => { + client.attachTarget(tab.actor).then(([response, tabClient]) => { if (!tabClient) { return; } diff --git a/devtools/server/tests/browser/browser_navigateEvents.js b/devtools/server/tests/browser/browser_navigateEvents.js index e445a7f5db94..bdb314f0fc3d 100644 --- a/devtools/server/tests/browser/browser_navigateEvents.js +++ b/devtools/server/tests/browser/browser_navigateEvents.js @@ -107,7 +107,7 @@ async function connectAndAttachTab() { }); const form = await connectDebuggerClient(client); const actorID = form.actor; - await client.attachTab(actorID); + await client.attachTarget(actorID); return { client, actorID }; } diff --git a/devtools/server/tests/browser/browser_stylesheets_getTextEmpty.js b/devtools/server/tests/browser/browser_stylesheets_getTextEmpty.js index 6d9db2862421..f1ced8b51825 100644 --- a/devtools/server/tests/browser/browser_stylesheets_getTextEmpty.js +++ b/devtools/server/tests/browser/browser_stylesheets_getTextEmpty.js @@ -20,7 +20,7 @@ add_task(async function() { const form = await connectDebuggerClient(client); info("Attaching to the active tab."); - await client.attachTab(form.actor); + await client.attachTarget(form.actor); const front = StyleSheetsFront(client, form); ok(front, "The StyleSheetsFront was created."); diff --git a/devtools/server/tests/browser/browser_stylesheets_nested-iframes.js b/devtools/server/tests/browser/browser_stylesheets_nested-iframes.js index 1164ff773790..4381cadee8fe 100644 --- a/devtools/server/tests/browser/browser_stylesheets_nested-iframes.js +++ b/devtools/server/tests/browser/browser_stylesheets_nested-iframes.js @@ -18,7 +18,7 @@ add_task(async function() { const form = await connectDebuggerClient(client); info("Attaching to the active tab."); - await client.attachTab(form.actor); + await client.attachTarget(form.actor); const front = StyleSheetsFront(client, form); ok(front, "The StyleSheetsFront was created."); diff --git a/devtools/server/tests/browser/browser_webextension_inspected_window.js b/devtools/server/tests/browser/browser_webextension_inspected_window.js index ff200054c9af..21e91f854776 100644 --- a/devtools/server/tests/browser/browser_webextension_inspected_window.js +++ b/devtools/server/tests/browser/browser_webextension_inspected_window.js @@ -32,7 +32,7 @@ async function setup(pageUrl) { const client = new DebuggerClient(DebuggerServer.connectPipe()); const form = await connectDebuggerClient(client); - const [, tabClient] = await client.attachTab(form.actor); + const [, tabClient] = await client.attachTarget(form.actor); const [, consoleClient] = await client.attachConsole(form.consoleActor, []); diff --git a/devtools/server/tests/mochitest/inspector-helpers.js b/devtools/server/tests/mochitest/inspector-helpers.js index 8b7be787fab2..eb0acce091ff 100644 --- a/devtools/server/tests/mochitest/inspector-helpers.js +++ b/devtools/server/tests/mochitest/inspector-helpers.js @@ -67,7 +67,7 @@ function attachURL(url, callback) { if (tab.url === url) { window.removeEventListener("message", loadListener); // eslint-disable-next-line max-nested-callbacks - client.attachTab(tab.actor).then(function() { + client.attachTarget(tab.actor).then(function() { try { callback(null, client, tab, win.document); } catch (ex) { diff --git a/devtools/server/tests/mochitest/webconsole-helpers.js b/devtools/server/tests/mochitest/webconsole-helpers.js index ed808ec75b1c..faebd21a71cf 100644 --- a/devtools/server/tests/mochitest/webconsole-helpers.js +++ b/devtools/server/tests/mochitest/webconsole-helpers.js @@ -59,7 +59,7 @@ async function attachURL(url) { throw new Error(`Could not find a tab matching URL ${url}`); } - const [, tabClient] = await client.attachTab(attachedTab.actor); + const [, tabClient] = await client.attachTarget(attachedTab.actor); const [, consoleClient] = await client.attachConsole(attachedTab.consoleActor, []); return { diff --git a/devtools/server/tests/unit/head_dbg.js b/devtools/server/tests/unit/head_dbg.js index 5b176711acb8..e5f33c6a2bb9 100644 --- a/devtools/server/tests/unit/head_dbg.js +++ b/devtools/server/tests/unit/head_dbg.js @@ -177,9 +177,9 @@ function findTab(tabs, title) { return null; } -function attachTab(client, tab) { +function attachTarget(client, tab) { dump("Attaching to tab with title '" + tab.title + "'.\n"); - return client.attachTab(tab.actor); + return client.attachTarget(tab.actor); } function waitForNewSource(threadClient, url) { @@ -357,7 +357,7 @@ function getTestTab(client, title, callback) { // response packet and a TabClient instance referring to that tab. function attachTestTab(client, title, callback) { getTestTab(client, title, function(tab) { - client.attachTab(tab.actor).then(([response, tabClient]) => { + client.attachTarget(tab.actor).then(([response, tabClient]) => { callback(response, tabClient); }); }); diff --git a/devtools/server/tests/unit/test_promises_actor_attach.js b/devtools/server/tests/unit/test_promises_actor_attach.js index 0985ec4c9ad3..06a6de76dc8c 100644 --- a/devtools/server/tests/unit/test_promises_actor_attach.js +++ b/devtools/server/tests/unit/test_promises_actor_attach.js @@ -15,14 +15,14 @@ add_task(async function() { const parentProcessActors = await getParentProcessActors(client); // We have to attach the chrome target actor before playing with the PromiseActor - await attachTab(client, parentProcessActors); + await attachTarget(client, parentProcessActors); await testAttach(client, parentProcessActors); const response = await listTabs(client); const targetTab = findTab(response.tabs, "promises-actor-test"); ok(targetTab, "Found our target tab."); - const [ tabResponse ] = await attachTab(client, targetTab); + const [ tabResponse ] = await attachTarget(client, targetTab); await testAttach(client, tabResponse); diff --git a/devtools/server/tests/unit/test_promises_actor_list_promises.js b/devtools/server/tests/unit/test_promises_actor_list_promises.js index 9c86204831f4..21fd968c9463 100644 --- a/devtools/server/tests/unit/test_promises_actor_list_promises.js +++ b/devtools/server/tests/unit/test_promises_actor_list_promises.js @@ -16,7 +16,7 @@ add_task(async function() { const parentProcessActors = await getParentProcessActors(client); // We have to attach the chrome target actor before playing with the PromiseActor - await attachTab(client, parentProcessActors); + await attachTarget(client, parentProcessActors); await testListPromises(client, parentProcessActors, v => new Promise(resolve => resolve(v))); diff --git a/devtools/server/tests/unit/test_promises_actor_onnewpromise.js b/devtools/server/tests/unit/test_promises_actor_onnewpromise.js index cd418ba894e0..31fa17a2f63a 100644 --- a/devtools/server/tests/unit/test_promises_actor_onnewpromise.js +++ b/devtools/server/tests/unit/test_promises_actor_onnewpromise.js @@ -19,7 +19,7 @@ add_task(async function() { ok(Promise.toString().includes("native code"), "Expect native DOM Promise"); // We have to attach the chrome target actor before playing with the PromiseActor - await attachTab(client, parentProcessActors); + await attachTarget(client, parentProcessActors); await testNewPromisesEvent(client, parentProcessActors, v => new Promise(resolve => resolve(v))); diff --git a/devtools/server/tests/unit/test_promises_actor_onpromisesettled.js b/devtools/server/tests/unit/test_promises_actor_onpromisesettled.js index 4d64aa021cce..1c39c85d984e 100644 --- a/devtools/server/tests/unit/test_promises_actor_onpromisesettled.js +++ b/devtools/server/tests/unit/test_promises_actor_onpromisesettled.js @@ -21,7 +21,7 @@ add_task(async function() { ok(Promise.toString().includes("native code"), "Expect native DOM Promise"); // We have to attach the chrome target actor before playing with the PromiseActor - await attachTab(client, parentProcessActors); + await attachTarget(client, parentProcessActors); await testPromisesSettled(client, parentProcessActors, v => new Promise(resolve => resolve(v)), v => new Promise((resolve, reject) => reject(v))); diff --git a/devtools/server/tests/unit/test_promises_client_getdependentpromises.js b/devtools/server/tests/unit/test_promises_client_getdependentpromises.js index 72fa1b0f08ca..e352f9e6ef52 100644 --- a/devtools/server/tests/unit/test_promises_client_getdependentpromises.js +++ b/devtools/server/tests/unit/test_promises_client_getdependentpromises.js @@ -14,7 +14,7 @@ var EventEmitter = require("devtools/shared/event-emitter"); add_task(async function() { const client = await startTestDebuggerServer("test-promises-dependentpromises"); const parentProcessActors = await getParentProcessActors(client); - await attachTab(client, parentProcessActors); + await attachTarget(client, parentProcessActors); ok(Promise.toString().includes("native code"), "Expect native DOM Promise."); @@ -32,7 +32,7 @@ add_task(async function() { const response = await listTabs(client); const targetTab = findTab(response.tabs, "test-promises-dependentpromises"); ok(targetTab, "Found our target tab."); - await attachTab(client, targetTab); + await attachTarget(client, targetTab); await testGetDependentPromises(client, targetTab, () => { const debuggee = diff --git a/devtools/server/tests/unit/test_promises_object_creationtimestamp.js b/devtools/server/tests/unit/test_promises_object_creationtimestamp.js index 7140e49e8d37..b9f848b59b22 100644 --- a/devtools/server/tests/unit/test_promises_object_creationtimestamp.js +++ b/devtools/server/tests/unit/test_promises_object_creationtimestamp.js @@ -28,7 +28,7 @@ add_task(async function() { ok(Promise.toString().includes("native code"), "Expect native DOM Promise."); // We have to attach the chrome target actor before playing with the PromiseActor - await attachTab(client, parentProcessActors); + await attachTarget(client, parentProcessActors); await testPromiseCreationTimestamp(client, parentProcessActors, v => { return new Promise(resolve => resolve(v)); }); diff --git a/devtools/server/tests/unit/test_promises_object_timetosettle-01.js b/devtools/server/tests/unit/test_promises_object_timetosettle-01.js index 00e332bb0ddc..af434fb4799f 100644 --- a/devtools/server/tests/unit/test_promises_object_timetosettle-01.js +++ b/devtools/server/tests/unit/test_promises_object_timetosettle-01.js @@ -19,7 +19,7 @@ add_task(async function() { ok(Promise.toString().includes("native code"), "Expect native DOM Promise."); // We have to attach the chrome target actor before playing with the PromiseActor - await attachTab(client, parentProcessActors); + await attachTarget(client, parentProcessActors); await testGetTimeToSettle(client, parentProcessActors, () => { const p = new Promise(() => {}); p.name = "p"; diff --git a/devtools/server/tests/unit/test_promises_object_timetosettle-02.js b/devtools/server/tests/unit/test_promises_object_timetosettle-02.js index 85d66182fd2e..6339dad870ae 100644 --- a/devtools/server/tests/unit/test_promises_object_timetosettle-02.js +++ b/devtools/server/tests/unit/test_promises_object_timetosettle-02.js @@ -16,19 +16,19 @@ var EventEmitter = require("devtools/shared/event-emitter"); add_task(async function() { const client = await startTestDebuggerServer("test-promises-timetosettle"); const parentProcessActors = await getParentProcessActors(client); - await attachTab(client, parentProcessActors); + await attachTarget(client, parentProcessActors); ok(Promise.toString().includes("native code"), "Expect native DOM Promise."); // We have to attach the chrome target actor before playing with the PromiseActor - await attachTab(client, parentProcessActors); + await attachTarget(client, parentProcessActors); await testGetTimeToSettle(client, parentProcessActors, v => new Promise(resolve => setTimeout(() => resolve(v), 100))); const response = await listTabs(client); const targetTab = findTab(response.tabs, "test-promises-timetosettle"); ok(targetTab, "Found our target tab."); - await attachTab(client, targetTab); + await attachTarget(client, targetTab); await testGetTimeToSettle(client, targetTab, v => { const debuggee = diff --git a/devtools/server/tests/unit/test_setBreakpoint-at-the-beginning-of-a-line.js b/devtools/server/tests/unit/test_setBreakpoint-at-the-beginning-of-a-line.js index d394d957c281..9d83e25cb5b8 100644 --- a/devtools/server/tests/unit/test_setBreakpoint-at-the-beginning-of-a-line.js +++ b/devtools/server/tests/unit/test_setBreakpoint-at-the-beginning-of-a-line.js @@ -15,7 +15,7 @@ async function run_test() { const { tabs } = await listTabs(client); const tab = findTab(tabs, "test"); - const [, tabClient] = await attachTab(client, tab); + const [, tabClient] = await attachTarget(client, tab); const [, threadClient] = await attachThread(tabClient); await resume(threadClient); diff --git a/devtools/server/tests/unit/test_setBreakpoint-at-the-end-of-a-line.js b/devtools/server/tests/unit/test_setBreakpoint-at-the-end-of-a-line.js index df7381545aed..1e4616427abc 100644 --- a/devtools/server/tests/unit/test_setBreakpoint-at-the-end-of-a-line.js +++ b/devtools/server/tests/unit/test_setBreakpoint-at-the-end-of-a-line.js @@ -17,7 +17,7 @@ async function run_test() { const { tabs } = await listTabs(client); const tab = findTab(tabs, "test"); - const [, tabClient] = await attachTab(client, tab); + const [, tabClient] = await attachTarget(client, tab); const [, threadClient] = await attachThread(tabClient); await resume(threadClient); diff --git a/devtools/server/tests/unit/test_setBreakpoint-on-column-in-gcd-script.js b/devtools/server/tests/unit/test_setBreakpoint-on-column-in-gcd-script.js index 1c79e475b3c3..61140308326c 100644 --- a/devtools/server/tests/unit/test_setBreakpoint-on-column-in-gcd-script.js +++ b/devtools/server/tests/unit/test_setBreakpoint-on-column-in-gcd-script.js @@ -19,7 +19,7 @@ function run_test() { const { tabs } = await listTabs(client); const tab = findTab(tabs, "test"); - const [, tabClient] = await attachTab(client, tab); + const [, tabClient] = await attachTarget(client, tab); const [, threadClient] = await attachThread(tabClient); await resume(threadClient); diff --git a/devtools/server/tests/unit/test_setBreakpoint-on-column.js b/devtools/server/tests/unit/test_setBreakpoint-on-column.js index 39c364889c2e..15acac923c5d 100644 --- a/devtools/server/tests/unit/test_setBreakpoint-on-column.js +++ b/devtools/server/tests/unit/test_setBreakpoint-on-column.js @@ -18,7 +18,7 @@ function run_test() { const { tabs } = await listTabs(client); const tab = findTab(tabs, "test"); - const [, tabClient] = await attachTab(client, tab); + const [, tabClient] = await attachTarget(client, tab); const [, threadClient] = await attachThread(tabClient); await resume(threadClient); diff --git a/devtools/server/tests/unit/test_setBreakpoint-on-line-in-gcd-script.js b/devtools/server/tests/unit/test_setBreakpoint-on-line-in-gcd-script.js index 8e7fb3aea5eb..0815414ecaed 100644 --- a/devtools/server/tests/unit/test_setBreakpoint-on-line-in-gcd-script.js +++ b/devtools/server/tests/unit/test_setBreakpoint-on-line-in-gcd-script.js @@ -19,7 +19,7 @@ function run_test() { const { tabs } = await listTabs(client); const tab = findTab(tabs, "test"); - const [, tabClient] = await attachTab(client, tab); + const [, tabClient] = await attachTarget(client, tab); const [, threadClient] = await attachThread(tabClient); await resume(threadClient); diff --git a/devtools/server/tests/unit/test_setBreakpoint-on-line-with-multiple-offsets.js b/devtools/server/tests/unit/test_setBreakpoint-on-line-with-multiple-offsets.js index 7394a91a51f3..9797d4d38737 100644 --- a/devtools/server/tests/unit/test_setBreakpoint-on-line-with-multiple-offsets.js +++ b/devtools/server/tests/unit/test_setBreakpoint-on-line-with-multiple-offsets.js @@ -18,7 +18,7 @@ function run_test() { const { tabs } = await listTabs(client); const tab = findTab(tabs, "test"); - const [, tabClient] = await attachTab(client, tab); + const [, tabClient] = await attachTarget(client, tab); const [, threadClient] = await attachThread(tabClient); await resume(threadClient); diff --git a/devtools/server/tests/unit/test_setBreakpoint-on-line-with-multiple-statements.js b/devtools/server/tests/unit/test_setBreakpoint-on-line-with-multiple-statements.js index d1078b86b49b..42eab41994cd 100644 --- a/devtools/server/tests/unit/test_setBreakpoint-on-line-with-multiple-statements.js +++ b/devtools/server/tests/unit/test_setBreakpoint-on-line-with-multiple-statements.js @@ -18,7 +18,7 @@ function run_test() { const { tabs } = await listTabs(client); const tab = findTab(tabs, "test"); - const [, tabClient] = await attachTab(client, tab); + const [, tabClient] = await attachTarget(client, tab); const [, threadClient] = await attachThread(tabClient); await resume(threadClient); diff --git a/devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets-in-gcd-script.js b/devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets-in-gcd-script.js index d702eb267e5d..cf3f4800aebe 100644 --- a/devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets-in-gcd-script.js +++ b/devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets-in-gcd-script.js @@ -20,7 +20,7 @@ function run_test() { const { tabs } = await listTabs(client); const tab = findTab(tabs, "test"); - const [, tabClient] = await attachTab(client, tab); + const [, tabClient] = await attachTarget(client, tab); const [, threadClient] = await attachThread(tabClient); await resume(threadClient); diff --git a/devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets.js b/devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets.js index 501980a5d632..f7e50333ecb2 100644 --- a/devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets.js +++ b/devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets.js @@ -18,7 +18,7 @@ function run_test() { const { tabs } = await listTabs(client); const tab = findTab(tabs, "test"); - const [, tabClient] = await attachTab(client, tab); + const [, tabClient] = await attachTarget(client, tab); const [, threadClient] = await attachThread(tabClient); await resume(threadClient); diff --git a/devtools/server/tests/unit/test_setBreakpoint-on-line.js b/devtools/server/tests/unit/test_setBreakpoint-on-line.js index e99a2927b341..40b552fdad04 100644 --- a/devtools/server/tests/unit/test_setBreakpoint-on-line.js +++ b/devtools/server/tests/unit/test_setBreakpoint-on-line.js @@ -18,7 +18,7 @@ function run_test() { const { tabs } = await listTabs(client); const tab = findTab(tabs, "test"); - const [, tabClient] = await attachTab(client, tab); + const [, tabClient] = await attachTarget(client, tab); const [, threadClient] = await attachThread(tabClient); await resume(threadClient); diff --git a/devtools/server/tests/unit/test_xpcshell_debugging.js b/devtools/server/tests/unit/test_xpcshell_debugging.js index c48b24e2dec6..826b6b3513f4 100644 --- a/devtools/server/tests/unit/test_xpcshell_debugging.js +++ b/devtools/server/tests/unit/test_xpcshell_debugging.js @@ -29,7 +29,7 @@ add_task(async function() { const response = await client.getProcess(); const actor = response.form.actor; - const [, tabClient] = await client.attachTab(actor); + const [, tabClient] = await client.attachTarget(actor); const [, threadClient] = await tabClient.attachThread(null); const onResumed = new Promise(resolve => { threadClient.addOneTimeListener("paused", (event, packet) => { diff --git a/devtools/shared/client/debugger-client.js b/devtools/shared/client/debugger-client.js index 6fb69fa037da..d0a39e0c74e6 100644 --- a/devtools/shared/client/debugger-client.js +++ b/devtools/shared/client/debugger-client.js @@ -327,20 +327,20 @@ DebuggerClient.prototype = { }, /** - * Attach to a tab's target actor. + * Attach to a target actor. * * @param string targetActor * The target actor ID for the tab to attach. */ - attachTab: function(targetActor) { + attachTarget: function(targetActor) { if (this._clients.has(targetActor)) { - const cachedTab = this._clients.get(targetActor); + const cachedTarget = this._clients.get(targetActor); const cachedResponse = { - cacheDisabled: cachedTab.cacheDisabled, - javascriptEnabled: cachedTab.javascriptEnabled, - traits: cachedTab.traits, + cacheDisabled: cachedTarget.cacheDisabled, + javascriptEnabled: cachedTarget.javascriptEnabled, + traits: cachedTarget.traits, }; - return promise.resolve([cachedResponse, cachedTab]); + return promise.resolve([cachedResponse, cachedTarget]); } const packet = { @@ -348,9 +348,12 @@ DebuggerClient.prototype = { type: "attach" }; return this.request(packet).then(response => { - const tabClient = new TabClient(this, response); - this.registerClient(tabClient); - return [response, tabClient]; + // TabClient can actually represent targets other than a tab. + // It is planned to be renamed while being converted to a front + // in bug 1485660. + const targetClient = new TabClient(this, response); + this.registerClient(targetClient); + return [response, targetClient]; }); }, diff --git a/devtools/shared/webconsole/test/common.js b/devtools/shared/webconsole/test/common.js index b95528ded407..50dcbd01164a 100644 --- a/devtools/shared/webconsole/test/common.js +++ b/devtools/shared/webconsole/test/common.js @@ -79,7 +79,7 @@ var _attachConsole = async function( if (!attachToTab) { response = await state.dbgClient.getProcess(); - await state.dbgClient.attachTab(response.form.actor); + await state.dbgClient.attachTarget(response.form.actor); const consoleActor = response.form.consoleActor; state.actor = consoleActor; state.dbgClient.attachConsole(consoleActor, listeners) @@ -94,7 +94,7 @@ var _attachConsole = async function( return; } const tab = response.tabs[response.selected]; - const [, tabClient] = await state.dbgClient.attachTab(tab.actor); + const [, tabClient] = await state.dbgClient.attachTarget(tab.actor); if (attachToWorker) { const workerName = "console-test-worker.js#" + new Date().getTime(); const worker = new Worker(workerName);