Backed out changeset fdaeee8bac86 (bug 1476141) for XPCshell failure on devtools/shared/heapsnapshot/tests/unit/test_census_diff_03.js
authorDorel Luca <dluca@mozilla.com>
Fri, 27 Jul 2018 16:32:34 +0300
changeset 823534 12eb093c59b116052c1a400d2b2f72bcd09d52b0
parent 823533 ebcb402d09bbcd0e468bba432ab6d83e1141cba6
child 823535 a4f36dad7af522083a839e073e9a0991c783c3ce
push id117712
push userrwood@mozilla.com
push dateFri, 27 Jul 2018 15:10:54 +0000
bugs1476141
milestone63.0a1
backs outfdaeee8bac869feca0e6ac0e382560ac39e2df26
Backed out changeset fdaeee8bac86 (bug 1476141) for XPCshell failure on devtools/shared/heapsnapshot/tests/unit/test_census_diff_03.js
devtools/client/memory/test/unit/test_tree-map-01.js
devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_01.js
devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_02.js
devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_03.js
devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_04.js
devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_partialTraversal_01.js
devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_03.js
devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getCensusIndividuals_01.js
devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_01.js
devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getImmediatelyDominated_01.js
devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensusDiff_02.js
devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_07.js
devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-02.js
devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-07.js
devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-10.js
devtools/shared/heapsnapshot/tests/unit/test_census_diff_03.js
devtools/shared/heapsnapshot/tests/unit/test_census_diff_06.js
devtools/shared/heapsnapshot/tests/unit/test_census_filtering_01.js
devtools/shared/heapsnapshot/tests/unit/test_census_filtering_03.js
devtools/shared/heapsnapshot/tests/unit/test_census_filtering_04.js
devtools/shared/heapsnapshot/tests/unit/test_getReportLeaves_01.js
--- a/devtools/client/memory/test/unit/test_tree-map-01.js
+++ b/devtools/client/memory/test/unit/test_tree-map-01.js
@@ -27,18 +27,18 @@ add_task(async function() {
   const borderWidth = () => 1;
   const dragZoom = {
     offsetX: 0,
     offsetY: 0,
     zoom: 0
   };
   drawBox(ctx, node, borderWidth, dragZoom, padding);
   ok(true, JSON.stringify([ctx, fillRectValues, strokeRectValues]));
-  equal(ctx.fillStyle, "hsl(204,60%,70%)", "The fillStyle is set");
-  equal(ctx.strokeStyle, "hsl(204,60%,35%)", "The strokeStyle is set");
+  equal(ctx.fillStyle, "hsl(210,60%,70%)", "The fillStyle is set");
+  equal(ctx.strokeStyle, "hsl(210,60%,35%)", "The strokeStyle is set");
   equal(ctx.lineWidth, 1, "The lineWidth is set");
   deepEqual(fillRectValues, [10.5, 20.5, 49, 69], "Draws a filled rectangle");
   deepEqual(strokeRectValues, [10.5, 20.5, 49, 69], "Draws a stroked rectangle");
 
   dragZoom.zoom = 0.5;
 
   drawBox(ctx, node, borderWidth, dragZoom, padding);
   ok(true, JSON.stringify([ctx, fillRectValues, strokeRectValues]));
--- a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_01.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_01.js
@@ -18,31 +18,26 @@ const breakdown = {
   scripts: {
     by: "internalType",
     then: { by: "count", count: true, bytes: true },
   },
   other: {
     by: "internalType",
     then: { by: "count", count: true, bytes: true },
   },
-  domNode: {
-    by: "descriptiveType",
-    then: { by: "count", count: true, bytes: true },
-  },
 };
 
 const description = {
   objects: {
     Function: { count: 1, bytes: 32 },
     other: { count: 0, bytes: 0 }
   },
   strings: {},
   scripts: {},
-  other: {},
-  domNode: {}
+  other: {}
 };
 
 const expected = [
   "objects",
   "Function"
 ];
 
 const shallowSize = 32;
--- a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_02.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_02.js
@@ -18,30 +18,25 @@ const breakdown = {
   scripts: {
     by: "internalType",
     then: { by: "count", count: true, bytes: true },
   },
   other: {
     by: "internalType",
     then: { by: "count", count: true, bytes: true },
   },
-  domNode: {
-    by: "descriptiveType",
-    then: { by: "count", count: true, bytes: true },
-  },
 };
 
 const description = {
   objects: {
     other: { count: 1, bytes: 10 }
   },
   strings: {},
   scripts: {},
-  other: {},
-  domNode: {}
+  other: {}
 };
 
 const expected = [
   "objects",
   "other"
 ];
 
 const shallowSize = 10;
--- a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_03.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_03.js
@@ -18,32 +18,27 @@ const breakdown = {
   scripts: {
     by: "internalType",
     then: { by: "count", count: true, bytes: true },
   },
   other: {
     by: "internalType",
     then: { by: "count", count: true, bytes: true },
   },
-  domNode: {
-    by: "descriptiveType",
-    then: { by: "count", count: true, bytes: true },
-  },
 };
 
 const description = {
   objects: {
     other: { count: 0, bytes: 0 }
   },
   strings: {
     "JSString": { count: 1, bytes: 42 },
   },
   scripts: {},
-  other: {},
-  domNode: {}
+  other: {}
 };
 
 const expected = [
   "strings",
   "JSString"
 ];
 
 const shallowSize = 42;
--- a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_04.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_04.js
@@ -22,33 +22,28 @@ const breakdown = {
   scripts: {
     by: "internalType",
     then: { by: "count", count: true, bytes: true },
   },
   other: {
     by: "internalType",
     then: { by: "count", count: true, bytes: true },
   },
-  domNode: {
-    by: "descriptiveType",
-    then: { by: "count", count: true, bytes: true },
-  },
 };
 
 const stack = saveStack();
 
 const description = {
   objects: {
     Array: new Map([[stack, { count: 1, bytes: 512 }]]),
     other: { count: 0, bytes: 0 }
   },
   strings: {},
   scripts: {},
-  other: {},
-  domNode: {}
+  other: {}
 };
 
 const expected = [
   "objects",
   "Array",
   stack
 ];
 
--- a/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_partialTraversal_01.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_partialTraversal_01.js
@@ -33,31 +33,29 @@ const mockDominatorTree = {
   getImmediatelyDominated: id => (tree.get(id) || []).slice()
 };
 
 const mockSnapshot = {
   describeNode: _ => ({
     objects: { count: 0, bytes: 0 },
     strings: { count: 0, bytes: 0 },
     scripts: { count: 0, bytes: 0 },
-    other: { SomeType: { count: 1, bytes: 10 } },
-    domNode: { count: 0, bytes: 0 },
+    other: { SomeType: { count: 1, bytes: 10 } }
   })
 };
 
 const breakdown = {
   by: "coarseType",
   objects: { by: "count", count: true, bytes: true },
   strings: { by: "count", count: true, bytes: true },
   scripts: { by: "count", count: true, bytes: true },
   other: {
     by: "internalType",
     then: { by: "count", count: true, bytes: true }
   },
-  domNode: { by: "count", count: true, bytes: true },
 };
 
 const expected = {
   nodeId: 100,
   label: [
     "other",
     "SomeType"
   ],
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_03.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_03.js
@@ -5,17 +5,16 @@
 // Test other dominatorTrees can still be retrieved after deleting a snapshot
 
 const breakdown = {
   by: "coarseType",
   objects: { by: "count", count: true, bytes: true },
   scripts: { by: "count", count: true, bytes: true },
   strings: { by: "count", count: true, bytes: true },
   other: { by: "count", count: true, bytes: true },
-  domNode: { by: "count", count: true, bytes: true },
 };
 
 async function createSnapshotAndDominatorTree(client) {
   const snapshotFilePath = saveNewHeapSnapshot();
   await client.readHeapSnapshot(snapshotFilePath);
   const dominatorTreeId = await client.computeDominatorTree(snapshotFilePath);
   return { dominatorTreeId, snapshotFilePath };
 }
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getCensusIndividuals_01.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getCensusIndividuals_01.js
@@ -7,17 +7,16 @@
 const COUNT = { by: "count", count: true, bytes: true };
 
 const CENSUS_BREAKDOWN = {
   by: "coarseType",
   objects: COUNT,
   strings: COUNT,
   scripts: COUNT,
   other: COUNT,
-  domNode: COUNT,
 };
 
 const LABEL_BREAKDOWN = {
   by: "internalType",
   then: COUNT,
 };
 
 const MAX_INDIVIDUALS = 10;
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_01.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_01.js
@@ -5,17 +5,16 @@
 // Test the HeapAnalyses{Client,Worker} "getDominatorTree" request.
 
 const breakdown = {
   by: "coarseType",
   objects: { by: "count", count: true, bytes: true },
   scripts: { by: "count", count: true, bytes: true },
   strings: { by: "count", count: true, bytes: true },
   other: { by: "count", count: true, bytes: true },
-  domNode: { by: "count", count: true, bytes: true },
 };
 
 add_task(async function() {
   const client = new HeapAnalysesClient();
 
   const snapshotFilePath = saveNewHeapSnapshot();
   await client.readHeapSnapshot(snapshotFilePath);
   ok(true, "Should have read the heap snapshot");
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getImmediatelyDominated_01.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getImmediatelyDominated_01.js
@@ -5,17 +5,16 @@
 // Test the HeapAnalyses{Client,Worker} "getImmediatelyDominated" request.
 
 const breakdown = {
   by: "coarseType",
   objects: { by: "count", count: true, bytes: true },
   scripts: { by: "count", count: true, bytes: true },
   strings: { by: "count", count: true, bytes: true },
   other: { by: "count", count: true, bytes: true },
-  domNode: { by: "count", count: true, bytes: true },
 };
 
 add_task(async function() {
   const client = new HeapAnalysesClient();
 
   const snapshotFilePath = saveNewHeapSnapshot();
   await client.readHeapSnapshot(snapshotFilePath);
   const dominatorTreeId = await client.computeDominatorTree(snapshotFilePath);
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensusDiff_02.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensusDiff_02.js
@@ -19,20 +19,16 @@ const BREAKDOWN = {
   strings: {
     by: "internalType",
     then: { by: "count", count: true, bytes: true },
   },
   other: {
     by: "internalType",
     then: { by: "count", count: true, bytes: true },
   },
-  domNode: {
-    by: "descriptiveType",
-    then: { by: "count", count: true, bytes: true },
-  },
 };
 
 add_task(async function() {
   const firstSnapshotFilePath = saveNewHeapSnapshot();
   const secondSnapshotFilePath = saveNewHeapSnapshot();
 
   const client = new HeapAnalysesClient();
   await client.readHeapSnapshot(firstSnapshotFilePath);
--- a/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_07.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_07.js
@@ -19,20 +19,16 @@ const BREAKDOWN = {
   strings: {
     by: "internalType",
     then: { by: "count", count: true, bytes: true },
   },
   other: {
     by: "internalType",
     then: { by: "count", count: true, bytes: true },
   },
-  domNode: {
-    by: "descriptiveType",
-    then: { by: "count", count: true, bytes: true },
-  },
 };
 
 add_task(async function() {
   const client = new HeapAnalysesClient();
 
   const snapshotFilePath = saveNewHeapSnapshot();
   await client.readHeapSnapshot(snapshotFilePath);
   ok(true, "Should have read the heap snapshot");
--- a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-02.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-02.js
@@ -9,31 +9,29 @@
 const countBreakdown = { by: "count", count: true, bytes: true };
 
 const BREAKDOWN = {
   by: "coarseType",
   objects: { by: "objectClass", then: countBreakdown },
   strings: countBreakdown,
   scripts: countBreakdown,
   other: { by: "internalType", then: countBreakdown },
-  domNode: countBreakdown,
 };
 
 const REPORT = {
   "objects": {
     "Function": { bytes: 10, count: 1 },
     "Array": { bytes: 20, count: 2 },
   },
   "strings": { bytes: 10, count: 1 },
   "scripts": { bytes: 1, count: 1 },
   "other": {
     "js::Shape": { bytes: 30, count: 3 },
     "js::Shape2": { bytes: 40, count: 4 }
   },
-  "domNode": { bytes: 0, count: 0 }
 };
 
 const EXPECTED = {
   name: null,
   bytes: 0,
   totalBytes: 111,
   count: 0,
   totalCount: 12,
--- a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-07.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-07.js
@@ -21,37 +21,32 @@ function run_test() {
     strings: {
       by: "internalType",
       then: { by: "count", count: true, bytes: true },
     },
     other: {
       by: "internalType",
       then: { by: "count", count: true, bytes: true },
     },
-    domNode: {
-      by: "descriptiveType",
-      then: { by: "count", count: true, bytes: true },
-    }
   };
 
   const REPORT = {
     objects: {
       Array: { bytes: 50, count: 5 },
       other: { bytes: 0, count: 0 },
     },
     scripts: {
       "js::jit::JitScript": { bytes: 30, count: 3 },
     },
     strings: {
       JSAtom: { bytes: 60, count: 6 },
     },
     other: {
       "js::Shape": { bytes: 80, count: 8 },
-    },
-    domNode: { }
+    }
   };
 
   const EXPECTED = {
     name: null,
     bytes: 0,
     totalBytes: 220,
     count: 0,
     totalCount: 22,
@@ -72,28 +67,28 @@ function run_test() {
             children: [
               {
                 name: null,
                 bytes: 0,
                 totalBytes: 220,
                 count: 0,
                 totalCount: 22,
                 children: undefined,
-                id: 15,
-                parent: 14,
+                id: 14,
+                parent: 13,
                 reportLeafIndex: undefined,
               }
             ],
-            id: 14,
-            parent: 13,
+            id: 13,
+            parent: 12,
             reportLeafIndex: undefined,
           }
         ],
-        id: 13,
-        parent: 12,
+        id: 12,
+        parent: 11,
         reportLeafIndex: 9,
       },
       {
         name: "JSAtom",
         bytes: 60,
         totalBytes: 60,
         count: 6,
         totalCount: 6,
@@ -107,28 +102,28 @@ function run_test() {
             children: [
               {
                 name: null,
                 bytes: 0,
                 totalBytes: 220,
                 count: 0,
                 totalCount: 22,
                 children: undefined,
-                id: 18,
-                parent: 17,
+                id: 17,
+                parent: 16,
                 reportLeafIndex: undefined,
               }
             ],
-            id: 17,
-            parent: 16,
+            id: 16,
+            parent: 15,
             reportLeafIndex: undefined,
           }
         ],
-        id: 16,
-        parent: 12,
+        id: 15,
+        parent: 11,
         reportLeafIndex: 7,
       },
       {
         name: "Array",
         bytes: 50,
         totalBytes: 50,
         count: 5,
         totalCount: 5,
@@ -142,28 +137,28 @@ function run_test() {
             children: [
               {
                 name: null,
                 bytes: 0,
                 totalBytes: 220,
                 count: 0,
                 totalCount: 22,
                 children: undefined,
-                id: 21,
-                parent: 20,
+                id: 20,
+                parent: 19,
                 reportLeafIndex: undefined,
               }
             ],
-            id: 20,
-            parent: 19,
+            id: 19,
+            parent: 18,
             reportLeafIndex: undefined,
           }
         ],
-        id: 19,
-        parent: 12,
+        id: 18,
+        parent: 11,
         reportLeafIndex: 2,
       },
       {
         name: "js::jit::JitScript",
         bytes: 30,
         totalBytes: 30,
         count: 3,
         totalCount: 3,
@@ -177,30 +172,30 @@ function run_test() {
             children: [
               {
                 name: null,
                 bytes: 0,
                 totalBytes: 220,
                 count: 0,
                 totalCount: 22,
                 children: undefined,
-                id: 24,
-                parent: 23,
+                id: 23,
+                parent: 22,
                 reportLeafIndex: undefined,
               }
             ],
-            id: 23,
-            parent: 22,
+            id: 22,
+            parent: 21,
             reportLeafIndex: undefined,
           }
         ],
-        id: 22,
-        parent: 12,
+        id: 21,
+        parent: 11,
         reportLeafIndex: 5,
       },
     ],
-    id: 12,
+    id: 11,
     parent: undefined,
     reportLeafIndex: undefined,
   };
 
   compareCensusViewData(BREAKDOWN, REPORT, EXPECTED, { invert: true });
 }
--- a/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-10.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-10.js
@@ -15,29 +15,27 @@ function run_test() {
       then: { by: "count", count: true, bytes: true },
     },
     other: {
       by: "internalType",
       then: { by: "count", count: true, bytes: true },
     },
     strings: { by: "count", count: true, bytes: true },
     scripts: { by: "count", count: true, bytes: true },
-    domNode: { by: "count", count: true, bytes: true },
   };
 
   const REPORT = {
     objects: {
       Array: { count: 1, bytes: 10 },
     },
     other: {
       Array: { count: 1, bytes: 10 },
     },
     strings: { count: 0, bytes: 0 },
     scripts: { count: 0, bytes: 0 },
-    domNode: {count: 0, bytes: 0 },
   };
 
   const node = censusReportToCensusTreeNode(BREAKDOWN, REPORT, { invert: true });
 
   equal(node.children[0].name, "Array");
   equal(node.children[0].reportLeafIndex.size, 2);
   dumpn(`node.children[0].reportLeafIndex = ${[...node.children[0].reportLeafIndex]}`);
   ok(node.children[0].reportLeafIndex.has(2));
--- a/devtools/shared/heapsnapshot/tests/unit/test_census_diff_03.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_census_diff_03.js
@@ -5,17 +5,16 @@
 // Test diffing census reports of breakdown by "coarseType".
 
 const BREAKDOWN = {
   by: "coarseType",
   objects: { by: "count", count: true, bytes: true },
   scripts: { by: "count", count: true, bytes: true },
   strings: { by: "count", count: true, bytes: true },
   other: { by: "count", count: true, bytes: true },
-  domNode: { by: "count", count: true, bytes: true },
 };
 
 const REPORT1 = {
   objects: {
     count: 1,
     bytes: 10,
   },
   scripts: {
@@ -25,20 +24,16 @@ const REPORT1 = {
   strings: {
     count: 1,
     bytes: 10,
   },
   other: {
     count: 3,
     bytes: 30,
   },
-  domNode: {
-    count: 0,
-    bytes: 0,
-  },
 };
 
 const REPORT2 = {
   objects: {
     count: 1,
     bytes: 10,
   },
   scripts: {
@@ -48,20 +43,16 @@ const REPORT2 = {
   strings: {
     count: 2,
     bytes: 20,
   },
   other: {
     count: 4,
     bytes: 40,
   },
-  domNode: {
-    count: 0,
-    bytes: 0,
-  },
 };
 
 const EXPECTED = {
   objects: {
     count: 0,
     bytes: 0,
   },
   scripts: {
@@ -71,17 +62,13 @@ const EXPECTED = {
   strings: {
     count: 1,
     bytes: 10,
   },
   other: {
     count: 1,
     bytes: 10,
   },
-  domNode: {
-    count: 0,
-    bytes: 0,
-  },
 };
 
 function run_test() {
   assertDiff(BREAKDOWN, REPORT1, REPORT2, EXPECTED);
 }
--- a/devtools/shared/heapsnapshot/tests/unit/test_census_diff_06.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_census_diff_06.js
@@ -26,20 +26,16 @@ const BREAKDOWN = {
   scripts: {
     by: "internalType",
     then: { by: "count", count: false, bytes: true }
   },
   other: {
     by: "internalType",
     then: { by: "count", count: false, bytes: true }
   },
-  domNode: {
-    by: "internalType",
-    then: { by: "count", count: false, bytes: true }
-  },
 };
 
 const stack1 = saveStack();
 const stack2 = saveStack();
 const stack3 = saveStack();
 
 const REPORT1 = {
   objects: new Map([
@@ -58,18 +54,17 @@ const REPORT1 = {
     JSLinearString: { bytes: 5 },
   },
   scripts: {
     JSScript: { bytes: 1 },
     "js::jit::JitCode": { bytes: 2 },
   },
   other: {
     "mozilla::dom::Thing": { bytes: 1 },
-  },
-  domNode: {}
+  }
 };
 
 const REPORT2 = {
   objects: new Map([
     [stack2, { Array: { bytes: 1 },
                Date: { bytes: 2 },
                other: { bytes: 3 },
     }],
@@ -85,18 +80,17 @@ const REPORT2 = {
   },
   scripts: {
     JSScript: { bytes: 2 },
     "js::LazyScript": { bytes: 42 },
     "js::jit::JitCode": { bytes: 1 },
   },
   other: {
     "mozilla::dom::OtherThing": { bytes: 1 },
-  },
-  domNode: {}
+  }
 };
 
 const EXPECTED = {
   "objects": new Map([
     [stack1, { Function: { bytes: -1 },
                Object: { bytes: -2 },
                other: { bytes: 0 },
     }],
@@ -131,15 +125,14 @@ const EXPECTED = {
   },
   "other": {
     "mozilla::dom::Thing": {
       "bytes": -1
     },
     "mozilla::dom::OtherThing": {
       "bytes": 1
     }
-  },
-  "domNode": {},
+  }
 };
 
 function run_test() {
   assertDiff(BREAKDOWN, REPORT1, REPORT2, EXPECTED);
 }
--- a/devtools/shared/heapsnapshot/tests/unit/test_census_filtering_01.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_census_filtering_01.js
@@ -19,20 +19,16 @@ function run_test() {
     strings: {
       by: "internalType",
       then: { by: "count", count: true, bytes: true },
     },
     other: {
       by: "internalType",
       then: { by: "count", count: true, bytes: true },
     },
-    domNode: {
-      by: "descriptiveType",
-      then: { by: "count", count: true, bytes: true },
-    },
   };
 
   const REPORT = {
     objects: {
       Array: { bytes: 50, count: 5 },
       UInt8Array: { bytes: 80, count: 8 },
       Int32Array: { bytes: 320, count: 32 },
       other: { bytes: 0, count: 0 },
@@ -40,18 +36,17 @@ function run_test() {
     scripts: {
       "js::jit::JitScript": { bytes: 30, count: 3 },
     },
     strings: {
       JSAtom: { bytes: 60, count: 6 },
     },
     other: {
       "js::Shape": { bytes: 80, count: 8 },
-    },
-    domNode: {}
+    }
   };
 
   const EXPECTED = {
     name: null,
     bytes: 0,
     totalBytes: 620,
     count: 0,
     totalCount: 62,
@@ -65,47 +60,47 @@ function run_test() {
         children: [
           {
             name: "Int32Array",
             bytes: 320,
             totalBytes: 320,
             count: 32,
             totalCount: 32,
             children: undefined,
-            id: 16,
-            parent: 15,
+            id: 15,
+            parent: 14,
             reportLeafIndex: 4,
           },
           {
             name: "UInt8Array",
             bytes: 80,
             totalBytes: 80,
             count: 8,
             totalCount: 8,
             children: undefined,
-            id: 17,
-            parent: 15,
+            id: 16,
+            parent: 14,
             reportLeafIndex: 3,
           },
           {
             name: "Array",
             bytes: 50,
             totalBytes: 50,
             count: 5,
             totalCount: 5,
             children: undefined,
-            id: 18,
-            parent: 15,
+            id: 17,
+            parent: 14,
             reportLeafIndex: 2,
           }
         ],
-        id: 15,
-        parent: 14,
+        id: 14,
+        parent: 13,
         reportLeafIndex: undefined,
       }
     ],
-    id: 14,
+    id: 13,
     parent: undefined,
     reportLeafIndex: undefined,
   };
 
   compareCensusViewData(BREAKDOWN, REPORT, EXPECTED, { filter: "Array" });
 }
--- a/devtools/shared/heapsnapshot/tests/unit/test_census_filtering_03.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_census_filtering_03.js
@@ -19,20 +19,16 @@ function run_test() {
     strings: {
       by: "internalType",
       then: { by: "count", count: true, bytes: true },
     },
     other: {
       by: "internalType",
       then: { by: "count", count: true, bytes: true },
     },
-    domNode: {
-      by: "descriptiveType",
-      then: { by: "count", count: true, bytes: true },
-    },
   };
 
   const REPORT = {
     objects: {
       Array: { bytes: 50, count: 5 },
       UInt8Array: { bytes: 80, count: 8 },
       Int32Array: { bytes: 320, count: 32 },
       other: { bytes: 0, count: 0 },
@@ -40,26 +36,25 @@ function run_test() {
     scripts: {
       "js::jit::JitScript": { bytes: 30, count: 3 },
     },
     strings: {
       JSAtom: { bytes: 60, count: 6 },
     },
     other: {
       "js::Shape": { bytes: 80, count: 8 },
-    },
-    domNode: {}
+    }
   };
 
   const EXPECTED = {
     name: null,
     bytes: 0,
     totalBytes: 620,
     count: 0,
     totalCount: 62,
     children: undefined,
-    id: 14,
+    id: 13,
     parent: undefined,
     reportLeafIndex: undefined,
   };
 
   compareCensusViewData(BREAKDOWN, REPORT, EXPECTED, { filter: "zzzzzzzzzzzzzzzzzzzz" });
 }
--- a/devtools/shared/heapsnapshot/tests/unit/test_census_filtering_04.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_census_filtering_04.js
@@ -14,17 +14,16 @@ function run_test() {
     objects: { by: "objectClass", then: COUNT, other: COUNT },
     strings: COUNT,
     scripts: {
       by: "filename",
       then: INTERNAL_TYPE,
       noFilename: INTERNAL_TYPE
     },
     other: INTERNAL_TYPE,
-    domNode: { by: "descriptiveType", then: COUNT, other: COUNT },
   };
 
   const REPORT = {
     objects: {
       Function: {
         count: 7,
         bytes: 70
       },
@@ -45,18 +44,17 @@ function run_test() {
       count: 2,
       bytes: 20
     },
     other: {
       "js::Shape": {
         count: 1,
         bytes: 10
       }
-    },
-    domNode: {}
+    }
   };
 
   const EXPECTED = {
     name: null,
     bytes: 0,
     totalBytes: 200,
     count: 0,
     totalCount: 20,
@@ -70,36 +68,36 @@ function run_test() {
         totalCount: 13,
         children: [
           {
             name: "Function",
             bytes: 70,
             totalBytes: 70,
             count: 7,
             totalCount: 7,
-            id: 14,
-            parent: 13,
+            id: 13,
+            parent: 12,
             children: undefined,
             reportLeafIndex: 2,
           },
           {
             name: "Array",
             bytes: 60,
             totalBytes: 60,
             count: 6,
             totalCount: 6,
-            id: 15,
-            parent: 13,
+            id: 14,
+            parent: 12,
             children: undefined,
             reportLeafIndex: 3,
           },
         ],
-        id: 13,
-        parent: 12,
+        id: 12,
+        parent: 11,
         reportLeafIndex: undefined,
       }
     ],
-    id: 12,
+    id: 11,
     reportLeafIndex: undefined,
   };
 
   compareCensusViewData(BREAKDOWN, REPORT, EXPECTED, { filter: "objects" });
 }
--- a/devtools/shared/heapsnapshot/tests/unit/test_getReportLeaves_01.js
+++ b/devtools/shared/heapsnapshot/tests/unit/test_getReportLeaves_01.js
@@ -23,20 +23,16 @@ function run_test() {
         by: "internalType",
         then: { by: "count", count: true, bytes: true },
       },
     },
     other: {
       by: "internalType",
       then: { by: "count", count: true, bytes: true },
     },
-    domNode: {
-      by: "descriptiveType",
-      then: { by: "count", count: true, bytes: true },
-    },
   };
 
   const REPORT = {
     objects: {
       Array: { count: 6, bytes: 60 },
       Function: { count: 1, bytes: 10 },
       Object: { count: 1, bytes: 10 },
       RegExp: { count: 1, bytes: 10 },
@@ -52,17 +48,16 @@ function run_test() {
         JSScript: { count: 1, bytes: 10 },
         "js::jit::IonScript": { count: 1, bytes: 10 },
       },
     },
     other: {
       "js::Shape": { count: 7, bytes: 70 },
       "js::BaseShape": { count: 1, bytes: 10 },
     },
-    domNode: { },
   };
 
   const root = censusReportToCensusTreeNode(BREAKDOWN, REPORT);
   dumpn("CensusTreeNode tree = " + JSON.stringify(root, null, 4));
 
   (function assertEveryNodeCanFindItsLeaf(node) {
     if (node.reportLeafIndex) {
       const [ leaf ] = CensusUtils.getReportLeaves(new Set([node.reportLeafIndex]),