nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1283583 - Clean up code style in devtools/server/child.js. r=ochameau

Browse source 
MozReview-Commit-ID: GoHv6jvX6M1
This commit is contained in:
J. Ryan Stinnett 2016-06-28 17:57:24 -05:00
parent e2e3133f6f
commit 89a70c452d
2 changed files with 27 additions and 32 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
.eslintignore
View file

@ -109,6 +109,7 @@ devtools/client/webconsole/**
devtools/client/webide/**
!devtools/client/webide/components/webideCli.js
devtools/server/**
!devtools/server/child.js
!devtools/server/css-logic.js
!devtools/server/actors/webbrowser.js
!devtools/server/actors/styles.js

50
devtools/server/child.js
View file

@ -4,12 +4,12 @@
"use strict";
try {
/* global addMessageListener, removeMessageListener, sendAsyncMessage */
try {
var chromeGlobal = this;
// Encapsulate in its own scope to allows loading this frame script
// more than once.
// Encapsulate in its own scope to allows loading this frame script more than once.
(function () {
let Cu = Components.utils;
let { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
@ -17,17 +17,16 @@ try {
const { dumpn } = DevToolsUtils;
const { DebuggerServer, ActorPool } = require("devtools/server/main");
// Note that this frame script may be evaluated in non-e10s build
// In such case, DebuggerServer is already going to be initialized.
// Note that this frame script may be evaluated in non-e10s build. In such case,
// DebuggerServer is already going to be initialized.
if (!DebuggerServer.initialized) {
DebuggerServer.init();
DebuggerServer.isInChildProcess = true;
}
// In case of apps being loaded in parent process, DebuggerServer is already
// initialized, but child specific actors are not registered.
// Otherwise, for apps in child process, we need to load actors the first
// time we load child.js
// initialized, but child specific actors are not registered. Otherwise, for apps in
// child process, we need to load actors the first time we load child.js.
DebuggerServer.addChildActors();
let connections = new Map();
@ -56,31 +55,28 @@ try {
// See also: DebuggerServer.setupInChild()
let onSetupInChild = DevToolsUtils.makeInfallible(msg => {
let { module, setupChild, args } = msg.data;
let m, fn;
let m;
try {
m = require(module);
if (!setupChild in m) {
dumpn("ERROR: module '" + module + "' does not export '" +
setupChild + "'");
dumpn(`ERROR: module '${module}' does not export 'setupChild'`);
return false;
}
m[setupChild].apply(m, args);
} catch (e) {
let error_msg = "exception during actor module setup running in the child process: ";
DevToolsUtils.reportException(error_msg + e);
dumpn("ERROR: " + error_msg + " \n\t module: '" + module +
"' \n\t setupChild: '" + setupChild + "'\n" +
DevToolsUtils.safeErrorString(e));
let errorMessage =
"Exception during actor module setup running in the child process: ";
DevToolsUtils.reportException(errorMessage + e);
dumpn(`ERROR: ${errorMessage}\n\t module: '${module}'\n\t ` +
`setupChild: '${setupChild}'\n${DevToolsUtils.safeErrorString(e)}`);
return false;
}
if (msg.data.id) {
// Send a message back to know when it is processed
sendAsyncMessage("debug:setup-in-child-response",
{id: msg.data.id});
sendAsyncMessage("debug:setup-in-child-response", {id: msg.data.id});
}
return true;
});
@ -90,9 +86,9 @@ try {
let onDisconnect = DevToolsUtils.makeInfallible(function (msg) {
removeMessageListener("debug:disconnect", onDisconnect);
// Call DebuggerServerConnection.close to destroy all child actors
// (It should end up calling DebuggerServerConnection.onClosed
// that would actually cleanup all actor pools)
// Call DebuggerServerConnection.close to destroy all child actors. It should end up
// calling DebuggerServerConnection.onClosed that would actually cleanup all actor
// pools.
let prefix = msg.data.prefix;
let conn = connections.get(prefix);
if (conn) {
@ -103,16 +99,14 @@ try {
addMessageListener("debug:disconnect", onDisconnect);
let onInspect = DevToolsUtils.makeInfallible(function (msg) {
// Store the node to be inspected in a global variable
// (gInspectingNode). Later we'll fetch this variable again using
// the findInspectingNode request over the remote debugging
// protocol.
// Store the node to be inspected in a global variable (gInspectingNode). Later
// we'll fetch this variable again using the findInspectingNode request over the
// remote debugging protocol.
let inspector = require("devtools/server/actors/inspector");
inspector.setInspectingNode(msg.objects.node);
});
addMessageListener("debug:inspect", onInspect);
})();
} catch (e) {
dump("Exception in app child process: " + e + "\n");
dump(`Exception in app child process: ${e}\n`);
}