summaryrefslogtreecommitdiffstats
path: root/toolkit/modules/Troubleshoot.sys.mjs
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit/modules/Troubleshoot.sys.mjs')
-rw-r--r--toolkit/modules/Troubleshoot.sys.mjs20
1 files changed, 20 insertions, 0 deletions
diff --git a/toolkit/modules/Troubleshoot.sys.mjs b/toolkit/modules/Troubleshoot.sys.mjs
index 53259bcb67..43b8c1ca51 100644
--- a/toolkit/modules/Troubleshoot.sys.mjs
+++ b/toolkit/modules/Troubleshoot.sys.mjs
@@ -52,6 +52,7 @@ const PREFS_FOR_DISPLAY = [
"browser.startup.homepage",
"browser.startup.page",
"browser.tabs.",
+ "browser.toolbars.",
"browser.urlbar.",
"browser.zoom.",
"doh-rollout.",
@@ -412,6 +413,11 @@ var dataProviders = {
remoteType = remoteType === "preallocated" ? "prealloc" : remoteType;
} catch (e) {}
+ // We will split Utility by actor name, so do not do it now
+ if (remoteType === "utility") {
+ continue;
+ }
+
// The parent process is also managed by the ppmm (because
// of non-remote tabs), but it doesn't have a remoteType.
if (!remoteType) {
@@ -425,6 +431,20 @@ var dataProviders = {
}
}
+ for (let i = 0; i < processInfo.children.length; i++) {
+ if (processInfo.children[i].type === "utility") {
+ for (let utilityWithActor of processInfo.children[i].utilityActors.map(
+ e => `utility_${e.actorName}`
+ )) {
+ if (remoteTypes[utilityWithActor]) {
+ remoteTypes[utilityWithActor]++;
+ } else {
+ remoteTypes[utilityWithActor] = 1;
+ }
+ }
+ }
+ }
+
try {
let winUtils = Services.wm.getMostRecentWindow("").windowUtils;
if (winUtils.gpuProcessPid != -1) {