mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-17 15:25:52 +00:00
Bug 1172897 - Rename WorkerActor to WorkerTargetActor. r=ochameau
MozReview-Commit-ID: 2Qakr1PHKNZ --HG-- rename : devtools/client/debugger/test/mochitest/browser_dbg_WorkerActor.attach.js => devtools/client/debugger/test/mochitest/browser_dbg_WorkerTargetActor.attach.js rename : devtools/client/debugger/test/mochitest/browser_dbg_WorkerActor.attachThread.js => devtools/client/debugger/test/mochitest/browser_dbg_WorkerTargetActor.attachThread.js rename : devtools/client/debugger/test/mochitest/code_WorkerActor.attach-worker1.js => devtools/client/debugger/test/mochitest/code_WorkerTargetActor.attach-worker1.js rename : devtools/client/debugger/test/mochitest/code_WorkerActor.attach-worker2.js => devtools/client/debugger/test/mochitest/code_WorkerTargetActor.attach-worker2.js rename : devtools/client/debugger/test/mochitest/code_WorkerActor.attachThread-worker.js => devtools/client/debugger/test/mochitest/code_WorkerTargetActor.attachThread-worker.js rename : devtools/client/debugger/test/mochitest/doc_WorkerActor.attach-tab1.html => devtools/client/debugger/test/mochitest/doc_WorkerTargetActor.attach-tab1.html rename : devtools/client/debugger/test/mochitest/doc_WorkerActor.attach-tab2.html => devtools/client/debugger/test/mochitest/doc_WorkerTargetActor.attach-tab2.html rename : devtools/client/debugger/test/mochitest/doc_WorkerActor.attachThread-tab.html => devtools/client/debugger/test/mochitest/doc_WorkerTargetActor.attachThread-tab.html rename : devtools/server/actors/worker.js => devtools/server/actors/targets/worker.js rename : devtools/shared/specs/worker/worker.js => devtools/shared/specs/targets/worker.js extra : rebase_source : cc94b13a2e50db862bad9d7c518619052cc6e5b4
This commit is contained in:
parent
208d73f6df
commit
e2438e6bb8
@ -33,7 +33,7 @@ class ServiceWorkerTarget extends Component {
|
||||
scope: PropTypes.string.isRequired,
|
||||
// registrationActor can be missing in e10s.
|
||||
registrationActor: PropTypes.string,
|
||||
workerActor: PropTypes.string
|
||||
workerTargetActor: PropTypes.string
|
||||
}).isRequired
|
||||
};
|
||||
}
|
||||
@ -86,7 +86,7 @@ class ServiceWorkerTarget extends Component {
|
||||
}
|
||||
|
||||
const { client, target } = this.props;
|
||||
gDevToolsBrowser.openWorkerToolbox(client, target.workerActor);
|
||||
gDevToolsBrowser.openWorkerToolbox(client, target.workerTargetActor);
|
||||
}
|
||||
|
||||
push() {
|
||||
@ -99,7 +99,7 @@ class ServiceWorkerTarget extends Component {
|
||||
|
||||
const { client, target } = this.props;
|
||||
client.request({
|
||||
to: target.workerActor,
|
||||
to: target.workerTargetActor,
|
||||
type: "push"
|
||||
});
|
||||
}
|
||||
@ -149,7 +149,7 @@ class ServiceWorkerTarget extends Component {
|
||||
|
||||
isRunning() {
|
||||
// We know the target is running if it has a worker actor.
|
||||
return !!this.props.target.workerActor;
|
||||
return !!this.props.target.workerTargetActor;
|
||||
}
|
||||
|
||||
isActive() {
|
||||
|
@ -27,7 +27,7 @@ class WorkerTarget extends Component {
|
||||
target: PropTypes.shape({
|
||||
icon: PropTypes.string,
|
||||
name: PropTypes.string.isRequired,
|
||||
workerActor: PropTypes.string
|
||||
workerTargetActor: PropTypes.string
|
||||
}).isRequired
|
||||
};
|
||||
}
|
||||
@ -39,7 +39,7 @@ class WorkerTarget extends Component {
|
||||
|
||||
debug() {
|
||||
const { client, target } = this.props;
|
||||
gDevToolsBrowser.openWorkerToolbox(client, target.workerActor);
|
||||
gDevToolsBrowser.openWorkerToolbox(client, target.workerTargetActor);
|
||||
}
|
||||
|
||||
render() {
|
||||
|
@ -35,7 +35,7 @@ class Worker extends Component {
|
||||
scope: PropTypes.string.isRequired,
|
||||
// registrationActor can be missing in e10s.
|
||||
registrationActor: PropTypes.string,
|
||||
workerActor: PropTypes.string
|
||||
workerTargetActor: PropTypes.string
|
||||
}).isRequired
|
||||
};
|
||||
}
|
||||
@ -55,7 +55,7 @@ class Worker extends Component {
|
||||
}
|
||||
|
||||
const { client, worker } = this.props;
|
||||
gDevToolsBrowser.openWorkerToolbox(client, worker.workerActor);
|
||||
gDevToolsBrowser.openWorkerToolbox(client, worker.workerTargetActor);
|
||||
}
|
||||
|
||||
start() {
|
||||
@ -81,7 +81,7 @@ class Worker extends Component {
|
||||
|
||||
isRunning() {
|
||||
// We know the worker is running if it has a worker actor.
|
||||
return !!this.props.worker.workerActor;
|
||||
return !!this.props.worker.workerTargetActor;
|
||||
}
|
||||
|
||||
isActive() {
|
||||
|
@ -501,17 +501,17 @@ Workers.prototype = {
|
||||
workerForms[worker.actor] = worker;
|
||||
}
|
||||
|
||||
for (let workerActor in this._workerForms) {
|
||||
if (!(workerActor in workerForms)) {
|
||||
DebuggerView.Workers.removeWorker(this._workerForms[workerActor]);
|
||||
delete this._workerForms[workerActor];
|
||||
for (let workerTargetActor in this._workerForms) {
|
||||
if (!(workerTargetActor in workerForms)) {
|
||||
DebuggerView.Workers.removeWorker(this._workerForms[workerTargetActor]);
|
||||
delete this._workerForms[workerTargetActor];
|
||||
}
|
||||
}
|
||||
|
||||
for (let workerActor in workerForms) {
|
||||
if (!(workerActor in this._workerForms)) {
|
||||
let workerForm = workerForms[workerActor];
|
||||
this._workerForms[workerActor] = workerForm;
|
||||
for (let workerTargetActor in workerForms) {
|
||||
if (!(workerTargetActor in this._workerForms)) {
|
||||
let workerForm = workerForms[workerTargetActor];
|
||||
this._workerForms[workerTargetActor] = workerForm;
|
||||
DebuggerView.Workers.addWorker(workerForm);
|
||||
}
|
||||
}
|
||||
|
@ -52,9 +52,9 @@ support-files =
|
||||
code_worker-source-map.coffee
|
||||
code_worker-source-map.js
|
||||
code_worker-source-map.js.map
|
||||
code_WorkerActor.attach-worker1.js
|
||||
code_WorkerActor.attach-worker2.js
|
||||
code_WorkerActor.attachThread-worker.js
|
||||
code_WorkerTargetActor.attach-worker1.js
|
||||
code_WorkerTargetActor.attach-worker2.js
|
||||
code_WorkerTargetActor.attachThread-worker.js
|
||||
doc_auto-pretty-print-01.html
|
||||
doc_auto-pretty-print-02.html
|
||||
doc_binary_search.html
|
||||
@ -121,9 +121,9 @@ support-files =
|
||||
doc_whitespace-property-names.html
|
||||
doc_with-frame.html
|
||||
doc_worker-source-map.html
|
||||
doc_WorkerActor.attach-tab1.html
|
||||
doc_WorkerActor.attach-tab2.html
|
||||
doc_WorkerActor.attachThread-tab.html
|
||||
doc_WorkerTargetActor.attach-tab1.html
|
||||
doc_WorkerTargetActor.attach-tab2.html
|
||||
doc_WorkerTargetActor.attachThread-tab.html
|
||||
head.js
|
||||
sjs_post-page.sjs
|
||||
sjs_random-javascript.sjs
|
||||
|
@ -52,9 +52,9 @@ support-files =
|
||||
code_worker-source-map.coffee
|
||||
code_worker-source-map.js
|
||||
code_worker-source-map.js.map
|
||||
code_WorkerActor.attach-worker1.js
|
||||
code_WorkerActor.attach-worker2.js
|
||||
code_WorkerActor.attachThread-worker.js
|
||||
code_WorkerTargetActor.attach-worker1.js
|
||||
code_WorkerTargetActor.attach-worker2.js
|
||||
code_WorkerTargetActor.attachThread-worker.js
|
||||
doc_auto-pretty-print-01.html
|
||||
doc_auto-pretty-print-02.html
|
||||
doc_binary_search.html
|
||||
@ -121,9 +121,9 @@ support-files =
|
||||
doc_whitespace-property-names.html
|
||||
doc_with-frame.html
|
||||
doc_worker-source-map.html
|
||||
doc_WorkerActor.attach-tab1.html
|
||||
doc_WorkerActor.attach-tab2.html
|
||||
doc_WorkerActor.attachThread-tab.html
|
||||
doc_WorkerTargetActor.attach-tab1.html
|
||||
doc_WorkerTargetActor.attach-tab2.html
|
||||
doc_WorkerTargetActor.attachThread-tab.html
|
||||
head.js
|
||||
sjs_post-page.sjs
|
||||
sjs_random-javascript.sjs
|
||||
@ -586,9 +586,9 @@ uses-unsafe-cpows = true
|
||||
skip-if = e10s && debug
|
||||
[browser_dbg_worker-window.js]
|
||||
skip-if = e10s && debug
|
||||
[browser_dbg_WorkerActor.attach.js]
|
||||
[browser_dbg_WorkerTargetActor.attach.js]
|
||||
skip-if = e10s && debug
|
||||
[browser_dbg_WorkerActor.attachThread.js]
|
||||
[browser_dbg_WorkerTargetActor.attachThread.js]
|
||||
skip-if = e10s && debug
|
||||
[browser_dbg_split-console-keypress.js]
|
||||
uses-unsafe-cpows = true
|
||||
|
@ -1,9 +1,9 @@
|
||||
var MAX_TOTAL_VIEWERS = "browser.sessionhistory.max_total_viewers";
|
||||
|
||||
var TAB1_URL = EXAMPLE_URL + "doc_WorkerActor.attach-tab1.html";
|
||||
var TAB2_URL = EXAMPLE_URL + "doc_WorkerActor.attach-tab2.html";
|
||||
var WORKER1_URL = "code_WorkerActor.attach-worker1.js";
|
||||
var WORKER2_URL = "code_WorkerActor.attach-worker2.js";
|
||||
var TAB1_URL = EXAMPLE_URL + "doc_WorkerTargetActor.attach-tab1.html";
|
||||
var TAB2_URL = EXAMPLE_URL + "doc_WorkerTargetActor.attach-tab2.html";
|
||||
var WORKER1_URL = "code_WorkerTargetActor.attach-worker1.js";
|
||||
var WORKER2_URL = "code_WorkerTargetActor.attach-worker2.js";
|
||||
|
||||
function test() {
|
||||
Task.spawn(function* () {
|
@ -1,5 +1,5 @@
|
||||
var TAB_URL = EXAMPLE_URL + "doc_WorkerActor.attachThread-tab.html";
|
||||
var WORKER_URL = "code_WorkerActor.attachThread-worker.js";
|
||||
var TAB_URL = EXAMPLE_URL + "doc_WorkerTargetActor.attachThread-tab.html";
|
||||
var WORKER_URL = "code_WorkerTargetActor.attachThread-worker.js";
|
||||
|
||||
function test() {
|
||||
Task.spawn(function* () {
|
@ -1,8 +1,8 @@
|
||||
// Check to make sure that a worker can be attached to a toolbox
|
||||
// and that the console works.
|
||||
|
||||
var TAB_URL = EXAMPLE_URL + "doc_WorkerActor.attachThread-tab.html";
|
||||
var WORKER_URL = "code_WorkerActor.attachThread-worker.js";
|
||||
var TAB_URL = EXAMPLE_URL + "doc_WorkerTargetActor.attachThread-tab.html";
|
||||
var WORKER_URL = "code_WorkerTargetActor.attachThread-worker.js";
|
||||
|
||||
add_task(async function testNormalExecution() {
|
||||
let {client, tab, tabClient, workerClient, toolbox, gDebugger} =
|
||||
|
@ -1,8 +1,8 @@
|
||||
// Check to make sure that a worker can be attached to a toolbox
|
||||
// and that the console works.
|
||||
|
||||
var TAB_URL = EXAMPLE_URL + "doc_WorkerActor.attachThread-tab.html";
|
||||
var WORKER_URL = "code_WorkerActor.attachThread-worker.js";
|
||||
var TAB_URL = EXAMPLE_URL + "doc_WorkerTargetActor.attachThread-tab.html";
|
||||
var WORKER_URL = "code_WorkerTargetActor.attachThread-worker.js";
|
||||
|
||||
add_task(async function testWhilePaused() {
|
||||
let {client, tab, tabClient, workerClient, toolbox, gDebugger} =
|
||||
|
@ -1,8 +1,8 @@
|
||||
// Check to make sure that a worker can be attached to a toolbox
|
||||
// and that the console works.
|
||||
|
||||
var TAB_URL = EXAMPLE_URL + "doc_WorkerActor.attachThread-tab.html";
|
||||
var WORKER_URL = "code_WorkerActor.attachThread-worker.js";
|
||||
var TAB_URL = EXAMPLE_URL + "doc_WorkerTargetActor.attachThread-tab.html";
|
||||
var WORKER_URL = "code_WorkerTargetActor.attachThread-worker.js";
|
||||
|
||||
// Test to see if creating the pause from the console works.
|
||||
add_task(async function testPausedByConsole() {
|
||||
|
@ -7,8 +7,8 @@
|
||||
const { PromiseTestUtils } = scopedCuImport("resource://testing-common/PromiseTestUtils.jsm");
|
||||
PromiseTestUtils.whitelistRejectionsGlobally(/connection just closed/);
|
||||
|
||||
const TAB_URL = EXAMPLE_URL + "doc_WorkerActor.attachThread-tab.html";
|
||||
const WORKER_URL = "code_WorkerActor.attachThread-worker.js";
|
||||
const TAB_URL = EXAMPLE_URL + "doc_WorkerTargetActor.attachThread-tab.html";
|
||||
const WORKER_URL = "code_WorkerTargetActor.attachThread-worker.js";
|
||||
|
||||
add_task(async function testPausedByConsole() {
|
||||
let {client, tab, workerClient, toolbox} =
|
||||
|
@ -8,8 +8,8 @@
|
||||
ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
|
||||
PromiseTestUtils.expectUncaughtRejection(/[object Object]/);
|
||||
|
||||
var TAB_URL = EXAMPLE_URL + "doc_WorkerActor.attachThread-tab.html";
|
||||
var WORKER_URL = "code_WorkerActor.attachThread-worker.js";
|
||||
var TAB_URL = EXAMPLE_URL + "doc_WorkerTargetActor.attachThread-tab.html";
|
||||
var WORKER_URL = "code_WorkerTargetActor.attachThread-worker.js";
|
||||
|
||||
add_task(async function() {
|
||||
await pushPrefs(["devtools.scratchpad.enabled", true]);
|
||||
|
@ -372,11 +372,11 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
|
||||
* worker actor.
|
||||
*
|
||||
* @param {DebuggerClient} client
|
||||
* @param {Object} workerActor
|
||||
* @param {Object} workerTargetActor
|
||||
* worker actor form to debug
|
||||
*/
|
||||
openWorkerToolbox(client, workerActor) {
|
||||
client.attachWorker(workerActor, (response, workerClient) => {
|
||||
openWorkerToolbox(client, workerTargetActor) {
|
||||
client.attachWorker(workerTargetActor, (response, workerClient) => {
|
||||
const workerTarget = TargetFactory.forWorker(workerClient);
|
||||
gDevTools.showToolbox(workerTarget, null, Toolbox.HostType.WINDOW)
|
||||
.then(toolbox => {
|
||||
|
@ -813,7 +813,7 @@ WorkerTarget.prototype = {
|
||||
},
|
||||
|
||||
hasActor: function(name) {
|
||||
// console is the only one actor implemented by WorkerActor
|
||||
// console is the only one actor implemented by WorkerTargetActor
|
||||
if (name == "console") {
|
||||
return true;
|
||||
}
|
||||
|
@ -26,7 +26,7 @@ RootActor: First one, automatically instantiated when we start connecting.
|
||||
toolbox at.
|
||||
Examples include:
|
||||
FrameTargetActor (for a frame, such as a tab)
|
||||
WorkerActor (for various kind of workers)
|
||||
WorkerTargetActor (for various kind of workers)
|
||||
|
|
||||
\-- Tab-scoped actors:
|
||||
Actors exposing one particular feature set. They are children of a
|
||||
@ -67,7 +67,7 @@ RootActor (root.js)
|
||||
| Extends the abstract class BrowsingContextTargetActor.
|
||||
| Returned by "connect" on FrameTargetActorProxy.
|
||||
|
|
||||
|-- WorkerActor (worker.js)
|
||||
|-- WorkerTargetActor (worker.js)
|
||||
| Targets a worker (applies to various kinds like web worker, service
|
||||
| worker, etc.).
|
||||
| Returned by "listWorkers" request to the root actor to get all workers.
|
||||
|
@ -14,7 +14,7 @@ const { ActorPool } = require("devtools/server/main");
|
||||
const { assert } = require("devtools/shared/DevToolsUtils");
|
||||
const { TabSources } = require("./utils/TabSources");
|
||||
|
||||
loader.lazyRequireGetter(this, "WorkerActorList", "devtools/server/actors/worker/worker-list", true);
|
||||
loader.lazyRequireGetter(this, "WorkerTargetActorList", "devtools/server/actors/worker/worker-list", true);
|
||||
|
||||
function ChildProcessActor(connection) {
|
||||
this.conn = connection;
|
||||
@ -55,7 +55,7 @@ function ChildProcessActor(connection) {
|
||||
this._consoleScope = sandbox;
|
||||
|
||||
this._workerList = null;
|
||||
this._workerActorPool = null;
|
||||
this._workerTargetActorPool = null;
|
||||
this._onWorkerListChanged = this._onWorkerListChanged.bind(this);
|
||||
}
|
||||
exports.ChildProcessActor = ChildProcessActor;
|
||||
@ -114,7 +114,7 @@ ChildProcessActor.prototype = {
|
||||
|
||||
onListWorkers: function() {
|
||||
if (!this._workerList) {
|
||||
this._workerList = new WorkerActorList(this.conn, {});
|
||||
this._workerList = new WorkerTargetActorList(this.conn, {});
|
||||
}
|
||||
return this._workerList.getList().then(actors => {
|
||||
const pool = new ActorPool(this.conn);
|
||||
@ -122,9 +122,9 @@ ChildProcessActor.prototype = {
|
||||
pool.addActor(actor);
|
||||
}
|
||||
|
||||
this.conn.removeActorPool(this._workerActorPool);
|
||||
this._workerActorPool = pool;
|
||||
this.conn.addActorPool(this._workerActorPool);
|
||||
this.conn.removeActorPool(this._workerTargetActorPool);
|
||||
this._workerTargetActorPool = pool;
|
||||
this.conn.addActorPool(this._workerTargetActorPool);
|
||||
|
||||
this._workerList.onListChanged = this._onWorkerListChanged;
|
||||
|
||||
|
@ -73,7 +73,6 @@ DevToolsModules(
|
||||
'webextension.js',
|
||||
'webgl.js',
|
||||
'window.js',
|
||||
'worker.js',
|
||||
)
|
||||
|
||||
with Files('animation.js'):
|
||||
|
@ -435,9 +435,9 @@ RootActor.prototype = {
|
||||
pool.addActor(actor);
|
||||
}
|
||||
|
||||
this.conn.removeActorPool(this._workerActorPool);
|
||||
this._workerActorPool = pool;
|
||||
this.conn.addActorPool(this._workerActorPool);
|
||||
this.conn.removeActorPool(this._workerTargetActorPool);
|
||||
this._workerTargetActorPool = pool;
|
||||
this.conn.addActorPool(this._workerTargetActorPool);
|
||||
|
||||
return {
|
||||
"from": this.actorID,
|
||||
|
@ -39,7 +39,7 @@ const { browsingContextTargetSpec } = require("devtools/shared/specs/targets/bro
|
||||
|
||||
loader.lazyRequireGetter(this, "ThreadActor", "devtools/server/actors/thread", true);
|
||||
loader.lazyRequireGetter(this, "unwrapDebuggerObjectGlobal", "devtools/server/actors/thread", true);
|
||||
loader.lazyRequireGetter(this, "WorkerActorList", "devtools/server/actors/worker/worker-list", true);
|
||||
loader.lazyRequireGetter(this, "WorkerTargetActorList", "devtools/server/actors/worker/worker-list", true);
|
||||
loader.lazyImporter(this, "ExtensionContent", EXTENSION_CONTENT_JSM);
|
||||
|
||||
loader.lazyRequireGetter(this, "StyleSheetActor", "devtools/server/actors/stylesheets", true);
|
||||
@ -249,9 +249,10 @@ const browsingContextTargetPrototype = {
|
||||
logInPage: true,
|
||||
};
|
||||
|
||||
this._workerActorList = null;
|
||||
this._workerActorPool = null;
|
||||
this._onWorkerActorListChanged = this._onWorkerActorListChanged.bind(this);
|
||||
this._workerTargetActorList = null;
|
||||
this._workerTargetActorPool = null;
|
||||
this._onWorkerTargetActorListChanged =
|
||||
this._onWorkerTargetActorListChanged.bind(this);
|
||||
},
|
||||
|
||||
traits: null,
|
||||
@ -657,24 +658,24 @@ const browsingContextTargetPrototype = {
|
||||
return { error: "wrongState" };
|
||||
}
|
||||
|
||||
if (this._workerActorList === null) {
|
||||
this._workerActorList = new WorkerActorList(this.conn, {
|
||||
if (this._workerTargetActorList === null) {
|
||||
this._workerTargetActorList = new WorkerTargetActorList(this.conn, {
|
||||
type: Ci.nsIWorkerDebugger.TYPE_DEDICATED,
|
||||
window: this.window
|
||||
});
|
||||
}
|
||||
|
||||
return this._workerActorList.getList().then((actors) => {
|
||||
return this._workerTargetActorList.getList().then((actors) => {
|
||||
const pool = new ActorPool(this.conn);
|
||||
for (const actor of actors) {
|
||||
pool.addActor(actor);
|
||||
}
|
||||
|
||||
this.conn.removeActorPool(this._workerActorPool);
|
||||
this._workerActorPool = pool;
|
||||
this.conn.addActorPool(this._workerActorPool);
|
||||
this.conn.removeActorPool(this._workerTargetActorPool);
|
||||
this._workerTargetActorPool = pool;
|
||||
this.conn.addActorPool(this._workerTargetActorPool);
|
||||
|
||||
this._workerActorList.onListChanged = this._onWorkerActorListChanged;
|
||||
this._workerTargetActorList.onListChanged = this._onWorkerTargetActorListChanged;
|
||||
|
||||
return {
|
||||
"from": this.actorID,
|
||||
@ -693,8 +694,8 @@ const browsingContextTargetPrototype = {
|
||||
return {};
|
||||
},
|
||||
|
||||
_onWorkerActorListChanged() {
|
||||
this._workerActorList.onListChanged = null;
|
||||
_onWorkerTargetActorListChanged() {
|
||||
this._workerTargetActorList.onListChanged = null;
|
||||
this.conn.sendActorEvent(this.actorID, "workerListChanged");
|
||||
},
|
||||
|
||||
@ -935,14 +936,14 @@ const browsingContextTargetPrototype = {
|
||||
}
|
||||
|
||||
// Make sure that no more workerListChanged notifications are sent.
|
||||
if (this._workerActorList !== null) {
|
||||
this._workerActorList.onListChanged = null;
|
||||
this._workerActorList = null;
|
||||
if (this._workerTargetActorList !== null) {
|
||||
this._workerTargetActorList.onListChanged = null;
|
||||
this._workerTargetActorList = null;
|
||||
}
|
||||
|
||||
if (this._workerActorPool !== null) {
|
||||
this.conn.removeActorPool(this._workerActorPool);
|
||||
this._workerActorPool = null;
|
||||
if (this._workerTargetActorPool !== null) {
|
||||
this.conn.removeActorPool(this._workerTargetActorPool);
|
||||
this._workerTargetActorPool = null;
|
||||
}
|
||||
|
||||
this._attached = false;
|
||||
|
@ -8,4 +8,5 @@ DevToolsModules(
|
||||
'browsing-context.js',
|
||||
'frame-proxy.js',
|
||||
'frame.js',
|
||||
'worker.js',
|
||||
)
|
||||
|
@ -4,12 +4,18 @@
|
||||
|
||||
"use strict";
|
||||
|
||||
/*
|
||||
* Target actor for any of the various kinds of workers.
|
||||
*
|
||||
* See devtools/docs/backend/actor-hierarchy.md for more details.
|
||||
*/
|
||||
|
||||
const { Ci } = require("chrome");
|
||||
const ChromeUtils = require("ChromeUtils");
|
||||
const { DebuggerServer } = require("devtools/server/main");
|
||||
const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
|
||||
const protocol = require("devtools/shared/protocol");
|
||||
const { workerSpec } = require("devtools/shared/specs/worker/worker");
|
||||
const { workerTargetSpec } = require("devtools/shared/specs/targets/worker");
|
||||
|
||||
loader.lazyRequireGetter(this, "ChromeUtils");
|
||||
|
||||
@ -19,7 +25,7 @@ XPCOMUtils.defineLazyServiceGetter(
|
||||
"nsIServiceWorkerManager"
|
||||
);
|
||||
|
||||
const WorkerActor = protocol.ActorClassWithSpec(workerSpec, {
|
||||
const WorkerTargetActor = protocol.ActorClassWithSpec(workerTargetSpec, {
|
||||
initialize(conn, dbg) {
|
||||
protocol.Actor.prototype.initialize.call(this, conn);
|
||||
this._dbg = dbg;
|
||||
@ -179,4 +185,4 @@ const WorkerActor = protocol.ActorClassWithSpec(workerSpec, {
|
||||
}
|
||||
});
|
||||
|
||||
exports.WorkerActor = WorkerActor;
|
||||
exports.WorkerTargetActor = WorkerTargetActor;
|
@ -15,7 +15,7 @@ loader.lazyRequireGetter(this, "RootActor", "devtools/server/actors/root", true)
|
||||
loader.lazyRequireGetter(this, "FrameTargetActorProxy", "devtools/server/actors/targets/frame-proxy", true);
|
||||
loader.lazyRequireGetter(this, "BrowserAddonActor", "devtools/server/actors/addon", true);
|
||||
loader.lazyRequireGetter(this, "WebExtensionParentActor", "devtools/server/actors/webextension-parent", true);
|
||||
loader.lazyRequireGetter(this, "WorkerActorList", "devtools/server/actors/worker/worker-list", true);
|
||||
loader.lazyRequireGetter(this, "WorkerTargetActorList", "devtools/server/actors/worker/worker-list", true);
|
||||
loader.lazyRequireGetter(this, "ServiceWorkerRegistrationActorList", "devtools/server/actors/worker/worker-list", true);
|
||||
loader.lazyRequireGetter(this, "ProcessActorList", "devtools/server/actors/process", true);
|
||||
loader.lazyImporter(this, "AddonManager", "resource://gre/modules/AddonManager.jsm");
|
||||
@ -74,7 +74,7 @@ function createRootActor(connection) {
|
||||
return new RootActor(connection, {
|
||||
tabList: new BrowserTabList(connection),
|
||||
addonList: new BrowserAddonList(connection),
|
||||
workerList: new WorkerActorList(connection, {}),
|
||||
workerList: new WorkerTargetActorList(connection, {}),
|
||||
serviceWorkerRegistrationList:
|
||||
new ServiceWorkerRegistrationActorList(connection),
|
||||
processList: new ProcessActorList(),
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
const { Ci } = require("chrome");
|
||||
const { XPCOMUtils } = require("resource://gre/modules/XPCOMUtils.jsm");
|
||||
loader.lazyRequireGetter(this, "WorkerActor", "devtools/server/actors/worker", true);
|
||||
loader.lazyRequireGetter(this, "WorkerTargetActor", "devtools/server/actors/targets/worker", true);
|
||||
loader.lazyRequireGetter(this, "ServiceWorkerRegistrationActor", "devtools/server/actors/worker/service-worker", true);
|
||||
|
||||
XPCOMUtils.defineLazyServiceGetter(
|
||||
@ -39,7 +39,7 @@ function matchWorkerDebugger(dbg, options) {
|
||||
return true;
|
||||
}
|
||||
|
||||
function WorkerActorList(conn, options) {
|
||||
function WorkerTargetActorList(conn, options) {
|
||||
this._conn = conn;
|
||||
this._options = options;
|
||||
this._actors = new Map();
|
||||
@ -49,7 +49,7 @@ function WorkerActorList(conn, options) {
|
||||
this.onUnregister = this.onUnregister.bind(this);
|
||||
}
|
||||
|
||||
WorkerActorList.prototype = {
|
||||
WorkerTargetActorList.prototype = {
|
||||
getList() {
|
||||
// Create a set of debuggers.
|
||||
const dbgs = new Set();
|
||||
@ -71,7 +71,7 @@ WorkerActorList.prototype = {
|
||||
// Create an actor for each debugger for which we don't have one.
|
||||
for (const dbg of dbgs) {
|
||||
if (!this._actors.has(dbg)) {
|
||||
this._actors.set(dbg, new WorkerActor(this._conn, dbg));
|
||||
this._actors.set(dbg, new WorkerTargetActor(this._conn, dbg));
|
||||
}
|
||||
}
|
||||
|
||||
@ -135,7 +135,7 @@ WorkerActorList.prototype = {
|
||||
}
|
||||
};
|
||||
|
||||
exports.WorkerActorList = WorkerActorList;
|
||||
exports.WorkerTargetActorList = WorkerTargetActorList;
|
||||
|
||||
function ServiceWorkerRegistrationActorList(conn) {
|
||||
this._conn = conn;
|
||||
|
@ -362,8 +362,8 @@ DebuggerClient.prototype = {
|
||||
});
|
||||
},
|
||||
|
||||
attachWorker: function(workerActor, onResponse = noop) {
|
||||
let workerClient = this._clients.get(workerActor);
|
||||
attachWorker: function(workerTargetActor, onResponse = noop) {
|
||||
let workerClient = this._clients.get(workerTargetActor);
|
||||
if (workerClient !== undefined) {
|
||||
const response = {
|
||||
from: workerClient.actor,
|
||||
@ -374,7 +374,7 @@ DebuggerClient.prototype = {
|
||||
return promise.resolve([response, workerClient]);
|
||||
}
|
||||
|
||||
return this.request({ to: workerActor, type: "attach" }).then(response => {
|
||||
return this.request({ to: workerTargetActor, type: "attach" }).then(response => {
|
||||
if (response.error) {
|
||||
onResponse(response, null);
|
||||
return [response, null];
|
||||
|
@ -101,9 +101,9 @@ RootClient.prototype = {
|
||||
* - {Array} service
|
||||
* array of form-like objects for serviceworkers
|
||||
* - {Array} shared
|
||||
* Array of WorkerActor forms, containing shared workers.
|
||||
* Array of WorkerTargetActor forms, containing shared workers.
|
||||
* - {Array} other
|
||||
* Array of WorkerActor forms, containing other workers.
|
||||
* Array of WorkerTargetActor forms, containing other workers.
|
||||
*/
|
||||
listAllWorkers: async function() {
|
||||
let registrations = [];
|
||||
@ -157,7 +157,7 @@ RootClient.prototype = {
|
||||
const worker = {
|
||||
name: form.url,
|
||||
url: form.url,
|
||||
workerActor: form.actor
|
||||
workerTargetActor: form.actor
|
||||
};
|
||||
switch (form.type) {
|
||||
case Ci.nsIWorkerDebugger.TYPE_SERVICE:
|
||||
@ -168,7 +168,7 @@ RootClient.prototype = {
|
||||
if (!registration.url) {
|
||||
registration.name = registration.url = form.url;
|
||||
}
|
||||
registration.workerActor = form.actor;
|
||||
registration.workerTargetActor = form.actor;
|
||||
} else {
|
||||
worker.fetch = form.fetch;
|
||||
|
||||
|
@ -152,8 +152,8 @@ TabClient.prototype = {
|
||||
type: "listWorkers"
|
||||
}),
|
||||
|
||||
attachWorker: function(workerActor, onResponse) {
|
||||
return this.client.attachWorker(workerActor, onResponse);
|
||||
attachWorker: function(workerTargetActor, onResponse) {
|
||||
return this.client.attachWorker(workerTargetActor, onResponse);
|
||||
},
|
||||
};
|
||||
|
||||
|
@ -224,6 +224,11 @@ const Types = exports.__TypesForTests = [
|
||||
spec: "devtools/shared/specs/targets/frame",
|
||||
front: null,
|
||||
},
|
||||
{
|
||||
types: ["workerTarget"],
|
||||
spec: "devtools/shared/specs/targets/worker",
|
||||
front: null,
|
||||
},
|
||||
{
|
||||
types: ["timeline"],
|
||||
spec: "devtools/shared/specs/timeline",
|
||||
@ -259,11 +264,6 @@ const Types = exports.__TypesForTests = [
|
||||
spec: "devtools/shared/specs/worker/service-worker",
|
||||
front: null,
|
||||
},
|
||||
{
|
||||
types: ["worker"],
|
||||
spec: "devtools/shared/specs/worker/worker",
|
||||
front: null,
|
||||
},
|
||||
];
|
||||
|
||||
const lazySpecs = new Map();
|
||||
|
@ -7,4 +7,5 @@
|
||||
DevToolsModules(
|
||||
'browsing-context.js',
|
||||
'frame.js',
|
||||
'worker.js',
|
||||
)
|
||||
|
@ -5,8 +5,8 @@
|
||||
|
||||
const {Arg, RetVal, generateActorSpec} = require("devtools/shared/protocol");
|
||||
|
||||
const workerSpec = generateActorSpec({
|
||||
typeName: "worker",
|
||||
const workerTargetSpec = generateActorSpec({
|
||||
typeName: "workerTarget",
|
||||
|
||||
methods: {
|
||||
attach: {
|
||||
@ -30,4 +30,4 @@ const workerSpec = generateActorSpec({
|
||||
},
|
||||
});
|
||||
|
||||
exports.workerSpec = workerSpec;
|
||||
exports.workerTargetSpec = workerTargetSpec;
|
@ -6,5 +6,4 @@
|
||||
|
||||
DevToolsModules(
|
||||
'service-worker.js',
|
||||
'worker.js',
|
||||
)
|
||||
|
@ -105,13 +105,14 @@ var _attachConsole = async function(
|
||||
await waitForMessage(worker);
|
||||
|
||||
const { workers } = await tabClient.listWorkers();
|
||||
const workerActor = workers.filter(w => w.url == workerName)[0].actor;
|
||||
if (!workerActor) {
|
||||
const workerTargetActor = workers.filter(w => w.url == workerName)[0].actor;
|
||||
if (!workerTargetActor) {
|
||||
console.error("listWorkers failed. Unable to find the " +
|
||||
"worker actor\n");
|
||||
return;
|
||||
}
|
||||
const [workerResponse, workerClient] = await tabClient.attachWorker(workerActor);
|
||||
const [workerResponse, workerClient] =
|
||||
await tabClient.attachWorker(workerTargetActor);
|
||||
if (!workerClient || workerResponse.error) {
|
||||
console.error("attachWorker failed. No worker client or " +
|
||||
" error: " + workerResponse.error);
|
||||
|
Loading…
Reference in New Issue
Block a user