From 59203c63bb777a3bacec32fb8830fba33540e809 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 12 Jun 2024 07:35:29 +0200
Subject: Adding upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../performance-new/shared/background.sys.mjs      | 23 +++++++++++++++++-----
 devtools/client/performance-new/shared/utils.js    |  7 +++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

(limited to 'devtools/client/performance-new/shared')

diff --git a/devtools/client/performance-new/shared/background.sys.mjs b/devtools/client/performance-new/shared/background.sys.mjs
index 4b19f68b71..a110b3e4cb 100644
--- a/devtools/client/performance-new/shared/background.sys.mjs
+++ b/devtools/client/performance-new/shared/background.sys.mjs
@@ -124,7 +124,7 @@ export const presets = {
   "web-developer": {
     entries: 128 * 1024 * 1024,
     interval: 1,
-    features: ["screenshots", "js", "cpu"],
+    features: ["screenshots", "js", "cpu", "memory"],
     threads: ["GeckoMain", "Compositor", "Renderer", "DOM Worker"],
     duration: 0,
     profilerViewMode: "active-tab",
@@ -142,7 +142,15 @@ export const presets = {
   "firefox-platform": {
     entries: 128 * 1024 * 1024,
     interval: 1,
-    features: ["screenshots", "js", "stackwalk", "cpu", "java", "processcpu"],
+    features: [
+      "screenshots",
+      "js",
+      "stackwalk",
+      "cpu",
+      "java",
+      "processcpu",
+      "memory",
+    ],
     threads: [
       "GeckoMain",
       "Compositor",
@@ -165,7 +173,7 @@ export const presets = {
   graphics: {
     entries: 128 * 1024 * 1024,
     interval: 1,
-    features: ["stackwalk", "js", "cpu", "java", "processcpu"],
+    features: ["stackwalk", "js", "cpu", "java", "processcpu", "memory"],
     threads: [
       "GeckoMain",
       "Compositor",
@@ -199,6 +207,7 @@ export const presets = {
       "audiocallbacktracing",
       "ipcmessages",
       "processcpu",
+      "memory",
     ],
     threads: [
       "cubeb",
@@ -248,6 +257,7 @@ export const presets = {
       "java",
       "processcpu",
       "bandwidth",
+      "memory",
     ],
     threads: [
       "Compositor",
@@ -286,6 +296,7 @@ export const presets = {
       "markersallthreads",
       "power",
       "bandwidth",
+      "memory",
     ],
     threads: ["GeckoMain", "Renderer"],
     duration: 0,
@@ -785,12 +796,13 @@ async function getResponseForMessage(request, browser) {
           return profileCaptureResult.profile;
         case "ERROR":
           throw profileCaptureResult.error;
-        default:
+        default: {
           const { UnhandledCaseError } = lazy.Utils();
           throw new UnhandledCaseError(
             profileCaptureResult,
             "profileCaptureResult"
           );
+        }
       }
     }
     case "GET_SYMBOL_TABLE": {
@@ -831,13 +843,14 @@ async function getResponseForMessage(request, browser) {
       }
       return [];
     }
-    default:
+    default: {
       console.error(
         "An unknown message type was received by the profiler's WebChannel handler.",
         request
       );
       const { UnhandledCaseError } = lazy.Utils();
       throw new UnhandledCaseError(request, "WebChannel request");
+    }
   }
 }
 
diff --git a/devtools/client/performance-new/shared/utils.js b/devtools/client/performance-new/shared/utils.js
index ae00b673de..ac98962307 100644
--- a/devtools/client/performance-new/shared/utils.js
+++ b/devtools/client/performance-new/shared/utils.js
@@ -414,6 +414,13 @@ const featureDescriptions = [
       "Record how much CPU has been used between samples by each profiled thread.",
     recommended: true,
   },
+  {
+    name: "Memory Tracking",
+    value: "memory",
+    title:
+      "Track the memory allocations and deallocations per process over time.",
+    recommended: true,
+  },
   {
     name: "Java",
     value: "java",
-- 
cgit v1.2.3