From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:14:29 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- .../actors/network-monitor/channel-event-sink.js | 5 +++-- .../actors/network-monitor/network-event-actor.js | 19 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'devtools/server/actors/network-monitor') diff --git a/devtools/server/actors/network-monitor/channel-event-sink.js b/devtools/server/actors/network-monitor/channel-event-sink.js index 8ff00302f9..3db6bf148e 100644 --- a/devtools/server/actors/network-monitor/channel-event-sink.js +++ b/devtools/server/actors/network-monitor/channel-event-sink.js @@ -5,11 +5,12 @@ "use strict"; const { ComponentUtils } = ChromeUtils.importESModule( - "resource://gre/modules/ComponentUtils.sys.mjs" + "resource://gre/modules/ComponentUtils.sys.mjs", + { global: "contextual" } ); /** - * This is a nsIChannelEventSink implementation that monitors channel redirects and + * THIS is a nsIChannelEventSink implementation that monitors channel redirects and * informs the registered "collectors" about the old and new channels. */ const SINK_CLASS_DESCRIPTION = "NetworkMonitor Channel Event Sink"; diff --git a/devtools/server/actors/network-monitor/network-event-actor.js b/devtools/server/actors/network-monitor/network-event-actor.js index e59738dd38..38607279d4 100644 --- a/devtools/server/actors/network-monitor/network-event-actor.js +++ b/devtools/server/actors/network-monitor/network-event-actor.js @@ -18,10 +18,14 @@ const { const lazy = {}; -ChromeUtils.defineESModuleGetters(lazy, { - NetworkUtils: - "resource://devtools/shared/network-observer/NetworkUtils.sys.mjs", -}); +ChromeUtils.defineESModuleGetters( + lazy, + { + NetworkUtils: + "resource://devtools/shared/network-observer/NetworkUtils.sys.mjs", + }, + { global: "contextual" } +); const CONTENT_TYPE_REGEXP = /^content-type/i; @@ -559,13 +563,8 @@ class NetworkEventActor extends Actor { * @param object content * The response content. * @param object - * - boolean discardedResponseBody - * Tells if the response content was recorded or not. */ - addResponseContent( - content, - { discardResponseBody, blockedReason, blockingExtension } - ) { + addResponseContent(content, { blockedReason, blockingExtension }) { // Ignore calls when this actor is already destroyed if (this.isDestroyed()) { return; -- cgit v1.2.3