зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1217867 - Prevent duplicated setupInParent calls when debugging same e10s tab with multiple clients. r=jryans
This commit is contained in:
Родитель
35d2bc4f62
Коммит
68dc17ea2b
|
@ -958,6 +958,13 @@ var DebuggerServer = {
|
|||
// provides hook to actor modules that need to exchange messages
|
||||
// between e10s parent and child processes
|
||||
let onSetupInParent = function (msg) {
|
||||
// We may have multiple connectToChild instance running for the same tab
|
||||
// and need to filter the messages. Also the DebuggerServerConnection's
|
||||
// prefix has an additional '/' and the end, so use `includes`.
|
||||
if (!msg.json.prefix.includes(prefix)) {
|
||||
return;
|
||||
}
|
||||
|
||||
let { module, setupParent } = msg.json;
|
||||
let m, fn;
|
||||
|
||||
|
@ -1741,7 +1748,7 @@ DebuggerServerConnection.prototype = {
|
|||
* @return boolean
|
||||
* true if the setup helper returned successfully
|
||||
*/
|
||||
setupInParent: function({ conn, module, setupParent }) {
|
||||
setupInParent: function({ module, setupParent }) {
|
||||
if (!this.parentMessageManager) {
|
||||
return false;
|
||||
}
|
||||
|
@ -1749,6 +1756,7 @@ DebuggerServerConnection.prototype = {
|
|||
let { sendSyncMessage } = this.parentMessageManager;
|
||||
|
||||
return sendSyncMessage("debug:setup-in-parent", {
|
||||
prefix: this.prefix,
|
||||
module: module,
|
||||
setupParent: setupParent
|
||||
});
|
||||
|
|
Загрузка…
Ссылка в новой задаче