зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1468026 - Rename MarionetteMainProcess to MarionetteParentProcess. r=whimboo
The "parent process" terminology is already established in the parent process message manager. This aligns the Marionette component with this terminology. MozReview-Commit-ID: 12z1M5jAWDa --HG-- extra : rebase_source : e735dd5a15c39703cad9799dd7578fed5fb1f139
This commit is contained in:
Родитель
0e2c19f78e
Коммит
13565e21f4
|
@ -268,7 +268,7 @@ const RECOMMENDED_PREFS = new Map([
|
|||
const isRemote = Services.appinfo.processType ==
|
||||
Services.appinfo.PROCESS_TYPE_CONTENT;
|
||||
|
||||
class MarionetteMainProcess {
|
||||
class MarionetteParentProcess {
|
||||
constructor() {
|
||||
this.server = null;
|
||||
|
||||
|
@ -308,7 +308,7 @@ class MarionetteMainProcess {
|
|||
return this.running;
|
||||
|
||||
default:
|
||||
log.warn("Unknown IPC message to main process: " + name);
|
||||
log.warn("Unknown IPC message to parent process: " + name);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
@ -485,7 +485,7 @@ class MarionetteContentProcess {
|
|||
get running() {
|
||||
let reply = Services.cpmm.sendSyncMessage("Marionette:IsRunning");
|
||||
if (reply.length == 0) {
|
||||
log.warn("No reply from main process");
|
||||
log.warn("No reply from parent process");
|
||||
return false;
|
||||
}
|
||||
return reply[0];
|
||||
|
@ -508,7 +508,7 @@ const MarionetteFactory = {
|
|||
if (isRemote) {
|
||||
this.instance_ = new MarionetteContentProcess();
|
||||
} else {
|
||||
this.instance_ = new MarionetteMainProcess();
|
||||
this.instance_ = new MarionetteParentProcess();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -79,7 +79,7 @@ let legacyactions = new legacyaction.Chain();
|
|||
let multiLast = {};
|
||||
|
||||
// TODO: Log.jsm is not e10s compatible (see https://bugzil.la/1411513),
|
||||
// query the main process for the current log level
|
||||
// query the parent process for the current log level
|
||||
const logger = Log.repository.getLogger("Marionette");
|
||||
if (logger.ownAppenders.length == 0) {
|
||||
let log = Services.cpmm.initialProcessData["Marionette:Log"];
|
||||
|
|
Загрузка…
Ссылка в новой задаче