mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-17 15:25:52 +00:00
Bug 1473513 - Backed out changeset 174fe98999ea for failures on mobile/android/tests/browser/chrome/test_debugger_server.html CLOSED TREE
Summary: MozReview-Commit-ID: GfSX2wYfLrN Depends on D6803 Bug #: 1473513 Differential Revision: https://phabricator.services.mozilla.com/D6804 --HG-- rename : devtools/server/actors/utils/actor-registry.js => devtools/server/actor-registry.js
This commit is contained in:
parent
8dac98409f
commit
a3c7499a55
@ -16,7 +16,7 @@ Services.prefs.setBoolPref("devtools.debugger.log", false);
|
||||
|
||||
var { BrowserToolboxProcess } = ChromeUtils.import("resource://devtools/client/framework/ToolboxProcess.jsm", {});
|
||||
var { DebuggerServer } = require("devtools/server/main");
|
||||
var { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
|
||||
var { ActorRegistry } = require("devtools/server/actor-registry");
|
||||
var { DebuggerClient } = require("devtools/shared/client/debugger-client");
|
||||
var ObjectClient = require("devtools/shared/client/object-client");
|
||||
var { AddonManager } = ChromeUtils.import("resource://gre/modules/AddonManager.jsm", {});
|
||||
|
@ -755,7 +755,7 @@ async function registerActorInContentProcess(url, options) {
|
||||
return ContentTask.spawn(gBrowser.selectedBrowser, { url, options }, args => {
|
||||
// eslint-disable-next-line no-shadow
|
||||
const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
|
||||
const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
|
||||
const { ActorRegistry } = require("devtools/server/actor-registry");
|
||||
ActorRegistry.registerModule(args.url, args.options);
|
||||
});
|
||||
}
|
||||
|
@ -30,7 +30,7 @@ ActorRegistry.registerModule("devtools/server/actors/addon/addons", {
|
||||
});
|
||||
```
|
||||
|
||||
If you are adding a new built-in actor, you should be registering it using `ActorRegistry.registerModule` in `addBrowserActors` or `addTargetScopedActors` in `/devtools/server/actors/utils/actor-registry.js`.
|
||||
If you are adding a new built-in actor, you should be registering it using `ActorRegistry.registerModule` in `addBrowserActors` or `addTargetScopedActors` in `/devtools/server/actor-registry.js`.
|
||||
|
||||
## A note about lazy registration
|
||||
|
||||
|
@ -51,7 +51,7 @@ The actor implementation would go somewhere like
|
||||
// You also need to export the actor class in your module for discovery.
|
||||
exports.HelloActor = HelloActor;
|
||||
|
||||
To activate your actor, register it in the `addBrowserActors` method in `server/actors/utils/actor-registry.js`.
|
||||
To activate your actor, register it in the `addBrowserActors` method in `server/actor-registry.js`.
|
||||
The registration code would look something like this:
|
||||
|
||||
this.registerModule("devtools/server/actors/hello-world", {
|
||||
|
@ -23,7 +23,7 @@
|
||||
var { Ci, Cu, Cr, Cc } = require("chrome");
|
||||
var Services = require("Services");
|
||||
const ChromeUtils = require("ChromeUtils");
|
||||
var { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
|
||||
var { ActorRegistry } = require("devtools/server/actor-registry");
|
||||
var DevToolsUtils = require("devtools/shared/DevToolsUtils");
|
||||
var { assert } = DevToolsUtils;
|
||||
var { TabSources } = require("devtools/server/actors/utils/TabSources");
|
||||
|
@ -7,7 +7,7 @@
|
||||
const { Cu, CC } = require("chrome");
|
||||
|
||||
const { DebuggerServer } = require("devtools/server/main");
|
||||
const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
|
||||
const { ActorRegistry } = require("devtools/server/actor-registry");
|
||||
|
||||
/**
|
||||
* Support for actor registration. Main used by ActorRegistryActor
|
||||
|
@ -6,7 +6,6 @@
|
||||
|
||||
DevToolsModules(
|
||||
'actor-registry-utils.js',
|
||||
'actor-registry.js',
|
||||
'audionodes.json',
|
||||
'automation-timeline.js',
|
||||
'breakpoint-actor-map.js',
|
||||
|
@ -9,7 +9,7 @@
|
||||
var { Ci } = require("chrome");
|
||||
var Services = require("Services");
|
||||
var { DebuggerServer } = require("devtools/server/main");
|
||||
var { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
|
||||
var { ActorRegistry } = require("devtools/server/actor-registry");
|
||||
var DevToolsUtils = require("devtools/shared/DevToolsUtils");
|
||||
|
||||
loader.lazyRequireGetter(this, "RootActor", "devtools/server/actors/root", true);
|
||||
|
@ -11,7 +11,7 @@
|
||||
var { Ci, Cc } = require("chrome");
|
||||
var Services = require("Services");
|
||||
var { Pool } = require("devtools/shared/protocol");
|
||||
var { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
|
||||
var { ActorRegistry } = require("devtools/server/actor-registry");
|
||||
var DevToolsUtils = require("devtools/shared/DevToolsUtils");
|
||||
var { dumpn } = DevToolsUtils;
|
||||
|
||||
|
@ -20,6 +20,7 @@ MOCHITEST_CHROME_MANIFESTS += ['tests/mochitest/chrome.ini']
|
||||
XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
|
||||
|
||||
DevToolsModules(
|
||||
'actor-registry.js',
|
||||
'main.js',
|
||||
)
|
||||
|
||||
|
@ -12,7 +12,7 @@ Services.scriptloader.loadSubScript(
|
||||
this);
|
||||
|
||||
const {DebuggerClient} = require("devtools/shared/client/debugger-client");
|
||||
const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
|
||||
const { ActorRegistry } = require("devtools/server/actor-registry");
|
||||
const {DebuggerServer} = require("devtools/server/main");
|
||||
|
||||
const PATH = "browser/devtools/server/tests/browser/";
|
||||
|
@ -47,7 +47,7 @@ function runTests() {
|
||||
/* eslint-disable no-shadow */
|
||||
const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
|
||||
const { DebuggerServer } = require("devtools/server/main");
|
||||
const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
|
||||
const { ActorRegistry } = require("devtools/server/actor-registry");
|
||||
/* eslint-enable no-shadow */
|
||||
|
||||
DebuggerServer.init();
|
||||
|
@ -31,7 +31,7 @@ Services.prefs.setBoolPref("devtools.debugger.log", true);
|
||||
Services.prefs.setBoolPref("devtools.debugger.remote-enabled", true);
|
||||
|
||||
const DevToolsUtils = require("devtools/shared/DevToolsUtils");
|
||||
const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
|
||||
const { ActorRegistry } = require("devtools/server/actor-registry");
|
||||
const { DebuggerServer } = require("devtools/server/main");
|
||||
const { DebuggerServer: WorkerDebuggerServer } = worker.require("devtools/server/main");
|
||||
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
|
||||
|
@ -7,7 +7,7 @@ const { LazyPool, createExtraActors } = require("devtools/shared/protocol/lazy-p
|
||||
const { RootActor } = require("devtools/server/actors/root");
|
||||
const { ThreadActor } = require("devtools/server/actors/thread");
|
||||
const { DebuggerServer } = require("devtools/server/main");
|
||||
const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
|
||||
const { ActorRegistry } = require("devtools/server/actor-registry");
|
||||
const { TabSources } = require("devtools/server/actors/utils/TabSources");
|
||||
const makeDebugger = require("devtools/server/actors/utils/make-debugger");
|
||||
|
||||
|
@ -6,7 +6,7 @@ const { LazyPool, createExtraActors } = require("devtools/shared/protocol/lazy-p
|
||||
const { RootActor } = require("devtools/server/actors/root");
|
||||
const { ThreadActor } = require("devtools/server/actors/thread");
|
||||
const { DebuggerServer } = require("devtools/server/main");
|
||||
const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
|
||||
const { ActorRegistry } = require("devtools/server/actor-registry");
|
||||
const promise = require("promise");
|
||||
|
||||
var gTestGlobals = [];
|
||||
|
@ -25,7 +25,7 @@ const Services = require("Services");
|
||||
// Enable remote debugging for the relevant tests.
|
||||
Services.prefs.setBoolPref("devtools.debugger.remote-enabled", true);
|
||||
|
||||
const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
|
||||
const { ActorRegistry } = require("devtools/server/actor-registry");
|
||||
const { DebuggerServer } = require("devtools/server/main");
|
||||
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
|
||||
|
||||
|
@ -3,7 +3,7 @@
|
||||
"use strict";
|
||||
|
||||
const { RootActor } = require("devtools/server/actors/root");
|
||||
const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
|
||||
const { ActorRegistry } = require("devtools/server/actor-registry");
|
||||
|
||||
/**
|
||||
* Root actor that doesn't have the bulk trait.
|
||||
|
@ -6,7 +6,7 @@ const { LazyPool, createExtraActors } = require("devtools/shared/protocol/lazy-p
|
||||
const { RootActor } = require("devtools/server/actors/root");
|
||||
const { ThreadActor } = require("devtools/server/actors/thread");
|
||||
const { DebuggerServer } = require("devtools/server/main");
|
||||
const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
|
||||
const { ActorRegistry } = require("devtools/server/actor-registry");
|
||||
|
||||
var gTestGlobals = [];
|
||||
DebuggerServer.addTestGlobal = function(global) {
|
||||
|
@ -34,7 +34,7 @@ module.exports = async function() {
|
||||
`function () {
|
||||
const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
|
||||
|
||||
const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
|
||||
const { ActorRegistry } = require("devtools/server/actor-registry");
|
||||
ActorRegistry.registerModule("chrome://damp/content/tests/server/actor.js", {
|
||||
prefix: "dampTest",
|
||||
constructor: "DampTestActor",
|
||||
|
Loading…
Reference in New Issue
Block a user