Backed out changeset e1576fc08c1c (bug 1246570) for XPCshell failures. r=backout

devtools/client/memory/test/browser/browser.ini

@@ -14,7 +14,6 @@ support-files =
 [browser_memory_dominator_trees_01.js]
 [browser_memory_dominator_trees_02.js]
 [browser_memory_filter_01.js]
-[browser_memory_keyboard.js]
 [browser_memory_no_allocation_stacks.js]
 [browser_memory_no_auto_expand.js]
     skip-if = debug # bug 1219554

devtools/client/memory/test/browser/browser_memory_keyboard.js

@@ -1,101 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Bug 1246570 - Check that when pressing on LEFT arrow, the parent tree node
-// gets focused.
-
-"use strict";
-
-const {
-  snapshotState
-} = require("devtools/client/memory/constants");
-const {
-  takeSnapshotAndCensus
-} = require("devtools/client/memory/actions/snapshot");
-
-const TEST_URL = "http://example.com/browser/devtools/client/memory/test/browser/doc_steady_allocation.html";
-
-function waitUntilFocused(store, node) {
-  return waitUntilState(store, state =>
-      state.snapshots.length === 1 &&
-      state.snapshots[0].state === snapshotState.SAVED_CENSUS &&
-      state.snapshots[0].census &&
-      state.snapshots[0].census.focused &&
-      state.snapshots[0].census.focused === node
-  );
-}
-
-function waitUntilExpanded(store, node) {
-  return waitUntilState(store, state =>
-    state.snapshots[0] &&
-    state.snapshots[0].census &&
-    state.snapshots[0].census.expanded.has(node.id));
-}
-
-this.test = makeMemoryTest(TEST_URL, function* ({ tab, panel }) {
-  const heapWorker = panel.panelWin.gHeapAnalysesClient;
-  const front = panel.panelWin.gFront;
-  const store = panel.panelWin.gStore;
-  const { getState, dispatch } = store;
-  const doc = panel.panelWin.document;
-
-  is(getState().breakdown.by, "coarseType");
-  yield dispatch(takeSnapshotAndCensus(front, heapWorker));
-  let census = getState().snapshots[0].census;
-  let root1 = census.report.children[0];
-  let root2 = census.report.children[0];
-  let root3 = census.report.children[0];
-  let root4 = census.report.children[0];
-  let child1 = root1.children[0];
-
-  info("Click on first node.");
-  let firstNode = doc.querySelector(".tree .heap-tree-item-name");
-  EventUtils.synthesizeMouseAtCenter(firstNode, {}, panel.panelWin);
-  yield waitUntilFocused(store, root1);
-  ok(true, "First root is selected after click.");
-
-  info("Press DOWN key, expect second root focused.");
-  EventUtils.synthesizeKey("VK_DOWN", {}, panel.panelWin);
-  yield waitUntilFocused(store, root2);
-  ok(true, "Second root is selected after pressing DOWN arrow.");
-
-  info("Press DOWN key, expect third root focused.");
-  EventUtils.synthesizeKey("VK_DOWN", {}, panel.panelWin);
-  yield waitUntilFocused(store, root3);
-  ok(true, "Third root is selected after pressing DOWN arrow.");
-
-  info("Press DOWN key, expect fourth root focused.");
-  EventUtils.synthesizeKey("VK_DOWN", {}, panel.panelWin);
-  yield waitUntilFocused(store, root4);
-  ok(true, "Fourth root is selected after pressing DOWN arrow.");
-
-  info("Press UP key, expect third root focused.");
-  EventUtils.synthesizeKey("VK_UP", {}, panel.panelWin);
-  yield waitUntilFocused(store, root3);
-  ok(true, "Third root is selected after pressing UP arrow.");
-
-  info("Press UP key, expect second root focused.");
-  EventUtils.synthesizeKey("VK_UP", {}, panel.panelWin);
-  yield waitUntilFocused(store, root2);
-  ok(true, "Second root is selected after pressing UP arrow.");
-
-  info("Press UP key, expect first root focused.");
-  EventUtils.synthesizeKey("VK_UP", {}, panel.panelWin);
-  yield waitUntilFocused(store, root1);
-  ok(true, "First root is selected after pressing UP arrow.");
-
-  info("Press RIGHT key");
-  EventUtils.synthesizeKey("VK_RIGHT", {}, panel.panelWin);
-  yield waitUntilExpanded(store, root1);
-  ok(true, "Root node is expanded.");
-
-  info("Press RIGHT key, expect first child focused.");
-  EventUtils.synthesizeKey("VK_RIGHT", {}, panel.panelWin);
-  yield waitUntilFocused(store, child1);
-  ok(true, "First child is selected after pressing RIGHT arrow.");
-
-  info("Press LEFT key, expect first root focused.");
-  EventUtils.synthesizeKey("VK_LEFT", {}, panel.panelWin);
-  yield waitUntilFocused(store, root1);
-  ok(true, "First root is selected after pressing LEFT arrow.");
-});

devtools/shared/heapsnapshot/CensusUtils.js

@@ -375,7 +375,7 @@ const createParentMap = exports.createParentMap = function (node,
   if (node.children) {
     for (let i = 0, length = node.children.length; i < length; i++) {
       const child = node.children[i];
-      aggregator[getId(child)] = node;
+      aggregator[getId(child)] = getId(node);
       createParentMap(child, getId, aggregator);
     }
   }