diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /devtools/client/shared/remote-debugging | |
parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'devtools/client/shared/remote-debugging')
4 files changed, 8 insertions, 8 deletions
diff --git a/devtools/client/shared/remote-debugging/adb/adb-addon.js b/devtools/client/shared/remote-debugging/adb/adb-addon.js index ddce411cb3..e597d34231 100644 --- a/devtools/client/shared/remote-debugging/adb/adb-addon.js +++ b/devtools/client/shared/remote-debugging/adb/adb-addon.js @@ -7,7 +7,7 @@ const { AddonManager } = ChromeUtils.importESModule( "resource://gre/modules/AddonManager.sys.mjs", // AddonManager is a singleton, never create two instances of it. - { loadInDevToolsLoader: false } + { global: "shared" } ); const EventEmitter = require("resource://devtools/shared/event-emitter.js"); diff --git a/devtools/client/shared/remote-debugging/adb/adb-process.js b/devtools/client/shared/remote-debugging/adb/adb-process.js index ade509125e..f916388124 100644 --- a/devtools/client/shared/remote-debugging/adb/adb-process.js +++ b/devtools/client/shared/remote-debugging/adb/adb-process.js @@ -68,7 +68,7 @@ class AdbProcess extends EventEmitter { params, params.length, { - observe(subject, topic, data) { + observe(subject, topic) { switch (topic) { case "process-finished": resolve(); diff --git a/devtools/client/shared/remote-debugging/adb/adb-running-checker.js b/devtools/client/shared/remote-debugging/adb/adb-running-checker.js index 7f952ca39b..5660e3ddc7 100644 --- a/devtools/client/shared/remote-debugging/adb/adb-running-checker.js +++ b/devtools/client/shared/remote-debugging/adb/adb-running-checker.js @@ -64,18 +64,18 @@ exports.check = async function check() { }; const setupSocket = function () { - socket.s.onerror = function (event) { + socket.s.onerror = function () { dumpn("running checker onerror"); finish(false); }; - socket.s.onopen = function (event) { + socket.s.onopen = function () { dumpn("running checker onopen"); state = "start"; runFSM(); }; - socket.s.onclose = function (event) { + socket.s.onclose = function () { dumpn("running checker onclose"); }; diff --git a/devtools/client/shared/remote-debugging/adb/commands/shell.js b/devtools/client/shared/remote-debugging/adb/commands/shell.js index 03f4bfcf78..e891ab218d 100644 --- a/devtools/client/shared/remote-debugging/adb/commands/shell.js +++ b/devtools/client/shared/remote-debugging/adb/commands/shell.js @@ -81,18 +81,18 @@ const shell = async function (deviceId, command) { }; const socket = client.connect(); - socket.s.onerror = function (event) { + socket.s.onerror = function () { dumpn("shell onerror"); reject("SOCKET_ERROR"); }; - socket.s.onopen = function (event) { + socket.s.onopen = function () { dumpn("shell onopen"); state = "start"; runFSM(); }; - socket.s.onclose = function (event) { + socket.s.onclose = function () { resolve(stdout); dumpn("shell onclose"); }; |