Adding upstream version 115.7.0esr.upstream/115.7.0esrupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

9 files changed, 254 insertions, 0 deletions

diff --git a/devtools/server/actors/targets/session-data-processors/blackboxing.js b/devtools/server/actors/targets/session-data-processors/blackboxing.js
new file mode 100644
index 0000000000..a81333f108
--- /dev/null
+++ b/devtools/server/actors/targets/session-data-processors/blackboxing.js
@@ -0,0 +1,19 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+module.exports = {
+  async addSessionDataEntry(targetActor, entries, isDocumentCreation) {
+    for (const { url, range } of entries) {
+      targetActor.sourcesManager.blackBox(url, range);
+    }
+  },
+
+  removeSessionDataEntry(targetActor, entries, isDocumentCreation) {
+    for (const { url, range } of entries) {
+      targetActor.sourcesManager.unblackBox(url, range);
+    }
+  },
+};
diff --git a/devtools/server/actors/targets/session-data-processors/breakpoints.js b/devtools/server/actors/targets/session-data-processors/breakpoints.js
new file mode 100644
index 0000000000..a3c778be59
--- /dev/null
+++ b/devtools/server/actors/targets/session-data-processors/breakpoints.js
@@ -0,0 +1,37 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const {
+  STATES: THREAD_STATES,
+} = require("resource://devtools/server/actors/thread.js");
+
+module.exports = {
+  async addSessionDataEntry(targetActor, entries, isDocumentCreation) {
+    const isTargetCreation =
+      targetActor.threadActor.state == THREAD_STATES.DETACHED;
+    if (isTargetCreation && !targetActor.targetType.endsWith("worker")) {
+      // If addSessionDataEntry is called during target creation, attach the
+      // thread actor automatically and pass the initial breakpoints.
+      // However, do not attach the thread actor for Workers. They use a codepath
+      // which releases the worker on `attach`. For them, the client will call `attach`. (bug 1691986)
+      await targetActor.threadActor.attach({ breakpoints: entries });
+    } else {
+      // If addSessionDataEntry is called for an existing target, set the new
+      // breakpoints on the already running thread actor.
+      await Promise.all(
+        entries.map(({ location, options }) =>
+          targetActor.threadActor.setBreakpoint(location, options)
+        )
+      );
+    }
+  },
+
+  removeSessionDataEntry(targetActor, entries, isDocumentCreation) {
+    for (const { location } of entries) {
+      targetActor.threadActor.removeBreakpoint(location);
+    }
+  },
+};
diff --git a/devtools/server/actors/targets/session-data-processors/event-breakpoints.js b/devtools/server/actors/targets/session-data-processors/event-breakpoints.js
new file mode 100644
index 0000000000..5cd2004281
--- /dev/null
+++ b/devtools/server/actors/targets/session-data-processors/event-breakpoints.js
@@ -0,0 +1,26 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const {
+  STATES: THREAD_STATES,
+} = require("resource://devtools/server/actors/thread.js");
+
+module.exports = {
+  async addSessionDataEntry(targetActor, entries, isDocumentCreation) {
+    // Same as comments for XHR breakpoints. See lines 117-118
+    if (
+      targetActor.threadActor.state == THREAD_STATES.DETACHED &&
+      !targetActor.targetType.endsWith("worker")
+    ) {
+      targetActor.threadActor.attach();
+    }
+    targetActor.threadActor.addEventBreakpoints(entries);
+  },
+
+  removeSessionDataEntry(targetActor, entries, isDocumentCreation) {
+    targetActor.threadActor.removeEventBreakpoints(entries);
+  },
+};
diff --git a/devtools/server/actors/targets/session-data-processors/index.js b/devtools/server/actors/targets/session-data-processors/index.js
new file mode 100644
index 0000000000..19b7d69302
--- /dev/null
+++ b/devtools/server/actors/targets/session-data-processors/index.js
@@ -0,0 +1,50 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const {
+  SessionDataHelpers,
+} = require("resource://devtools/server/actors/watcher/SessionDataHelpers.jsm");
+const { SUPPORTED_DATA } = SessionDataHelpers;
+
+const SessionDataProcessors = {};
+
+loader.lazyRequireGetter(
+  SessionDataProcessors,
+  SUPPORTED_DATA.BLACKBOXING,
+  "resource://devtools/server/actors/targets/session-data-processors/blackboxing.js"
+);
+loader.lazyRequireGetter(
+  SessionDataProcessors,
+  SUPPORTED_DATA.BREAKPOINTS,
+  "resource://devtools/server/actors/targets/session-data-processors/breakpoints.js"
+);
+loader.lazyRequireGetter(
+  SessionDataProcessors,
+  SUPPORTED_DATA.EVENT_BREAKPOINTS,
+  "resource://devtools/server/actors/targets/session-data-processors/event-breakpoints.js"
+);
+loader.lazyRequireGetter(
+  SessionDataProcessors,
+  SUPPORTED_DATA.RESOURCES,
+  "resource://devtools/server/actors/targets/session-data-processors/resources.js"
+);
+loader.lazyRequireGetter(
+  SessionDataProcessors,
+  SUPPORTED_DATA.TARGET_CONFIGURATION,
+  "resource://devtools/server/actors/targets/session-data-processors/target-configuration.js"
+);
+loader.lazyRequireGetter(
+  SessionDataProcessors,
+  SUPPORTED_DATA.THREAD_CONFIGURATION,
+  "resource://devtools/server/actors/targets/session-data-processors/thread-configuration.js"
+);
+loader.lazyRequireGetter(
+  SessionDataProcessors,
+  SUPPORTED_DATA.XHR_BREAKPOINTS,
+  "resource://devtools/server/actors/targets/session-data-processors/xhr-breakpoints.js"
+);
+
+exports.SessionDataProcessors = SessionDataProcessors;
diff --git a/devtools/server/actors/targets/session-data-processors/moz.build b/devtools/server/actors/targets/session-data-processors/moz.build
new file mode 100644
index 0000000000..ea924d7d79
--- /dev/null
+++ b/devtools/server/actors/targets/session-data-processors/moz.build
@@ -0,0 +1,16 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DevToolsModules(
+    "blackboxing.js",
+    "breakpoints.js",
+    "event-breakpoints.js",
+    "index.js",
+    "resources.js",
+    "target-configuration.js",
+    "thread-configuration.js",
+    "xhr-breakpoints.js",
+)
diff --git a/devtools/server/actors/targets/session-data-processors/resources.js b/devtools/server/actors/targets/session-data-processors/resources.js
new file mode 100644
index 0000000000..c784e128d3
--- /dev/null
+++ b/devtools/server/actors/targets/session-data-processors/resources.js
@@ -0,0 +1,17 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const Resources = require("resource://devtools/server/actors/resources/index.js");
+
+module.exports = {
+  async addSessionDataEntry(targetActor, entries, isDocumentCreation) {
+    await Resources.watchResources(targetActor, entries);
+  },
+
+  removeSessionDataEntry(targetActor, entries, isDocumentCreation) {
+    Resources.unwatchResources(targetActor, entries);
+  },
+};
diff --git a/devtools/server/actors/targets/session-data-processors/target-configuration.js b/devtools/server/actors/targets/session-data-processors/target-configuration.js
new file mode 100644
index 0000000000..e3fa7e0317
--- /dev/null
+++ b/devtools/server/actors/targets/session-data-processors/target-configuration.js
@@ -0,0 +1,23 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+module.exports = {
+  async addSessionDataEntry(targetActor, entries, isDocumentCreation) {
+    // Only WindowGlobalTargetActor implements updateTargetConfiguration,
+    // skip targetActor data entry update for other targets.
+    if (typeof targetActor.updateTargetConfiguration == "function") {
+      const options = {};
+      for (const { key, value } of entries) {
+        options[key] = value;
+      }
+      targetActor.updateTargetConfiguration(options, isDocumentCreation);
+    }
+  },
+
+  removeSessionDataEntry(targetActor, entries, isDocumentCreation) {
+    // configuration data entries are always added/updated, never removed.
+  },
+};
diff --git a/devtools/server/actors/targets/session-data-processors/thread-configuration.js b/devtools/server/actors/targets/session-data-processors/thread-configuration.js
new file mode 100644
index 0000000000..e81ef819f0
--- /dev/null
+++ b/devtools/server/actors/targets/session-data-processors/thread-configuration.js
@@ -0,0 +1,32 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const {
+  STATES: THREAD_STATES,
+} = require("resource://devtools/server/actors/thread.js");
+
+module.exports = {
+  async addSessionDataEntry(targetActor, entries, isDocumentCreation) {
+    const threadOptions = {};
+
+    for (const { key, value } of entries) {
+      threadOptions[key] = value;
+    }
+
+    if (
+      !targetActor.targetType.endsWith("worker") &&
+      targetActor.threadActor.state == THREAD_STATES.DETACHED
+    ) {
+      await targetActor.threadActor.attach(threadOptions);
+    } else {
+      await targetActor.threadActor.reconfigure(threadOptions);
+    }
+  },
+
+  removeSessionDataEntry(targetActor, entries, isDocumentCreation) {
+    // configuration data entries are always added/updated, never removed.
+  },
+};
diff --git a/devtools/server/actors/targets/session-data-processors/xhr-breakpoints.js b/devtools/server/actors/targets/session-data-processors/xhr-breakpoints.js
new file mode 100644
index 0000000000..d9a9bdc750
--- /dev/null
+++ b/devtools/server/actors/targets/session-data-processors/xhr-breakpoints.js
@@ -0,0 +1,34 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const {
+  STATES: THREAD_STATES,
+} = require("resource://devtools/server/actors/thread.js");
+
+module.exports = {
+  async addSessionDataEntry(targetActor, entries, isDocumentCreation) {
+    // The thread actor has to be initialized in order to correctly
+    // retrieve the stack trace when hitting an XHR
+    if (
+      targetActor.threadActor.state == THREAD_STATES.DETACHED &&
+      !targetActor.targetType.endsWith("worker")
+    ) {
+      await targetActor.threadActor.attach();
+    }
+
+    await Promise.all(
+      entries.map(({ path, method }) =>
+        targetActor.threadActor.setXHRBreakpoint(path, method)
+      )
+    );
+  },
+
+  removeSessionDataEntry(targetActor, entries, isDocumentCreation) {
+    for (const { path, method } of entries) {
+      targetActor.threadActor.removeXHRBreakpoint(path, method);
+    }
+  },
+};